automatic conversion of deregisterform.ui

5 files changed, 123 insertions, 123 deletions

diff --git a/src/gui/deregisterform.cpp b/src/gui/deregisterform.cpp
new file mode 100644
index 0000000..d8ff0ce
--- /dev/null
+++ b/src/gui/deregisterform.cpp
@@ -0,0 +1,22 @@
+#include "deregisterform.h"
+
+/*
+ *  Constructs a DeregisterForm which is a child of 'parent', with the
+ *  name 'name' and widget flags set to 'f'
+ *
+ *  The dialog will by default be modeless, unless you set 'modal' to
+ *  true to construct a modal dialog.
+ */
+DeregisterForm::DeregisterForm(QWidget* parent)
+	: QDialog(parent)
+{
+	setupUi(this);
+}
+
+/*
+ *  Destroys the object and frees any allocated resources
+ */
+DeregisterForm::~DeregisterForm()
+{
+	// no need to delete child widgets, Qt does it all for us
+}
diff --git a/src/gui/deregisterform.h b/src/gui/deregisterform.h
new file mode 100644
index 0000000..96825fb
--- /dev/null
+++ b/src/gui/deregisterform.h
@@ -0,0 +1,17 @@
+#ifndef DEREGISTERFORM_H
+#define DEREGISTERFORM_H
+
+#include <QDialog>
+
+#include "ui_deregisterform.h"
+
+class DeregisterForm : public QDialog, private Ui::DeregisterForm
+{
+    Q_OBJECT
+
+public:
+    DeregisterForm(QWidget* parent = 0);
+    ~DeregisterForm();
+};
+
+#endif // DEREGISTERFORM_H
diff --git a/src/gui/deregisterform.ui b/src/gui/deregisterform.ui
index fe70e5b..56f4cfe 100644
--- a/src/gui/deregisterform.ui
+++ b/src/gui/deregisterform.ui
@@ -1,105 +1,90 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
-<class>DeregisterForm</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>DeregisterForm</cstring>
-    </property>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0" stdsetdef="1">
+  <author></author>
+  <comment></comment>
+  <exportmacro></exportmacro>
+  <class>DeregisterForm</class>
+  <widget class="QDialog" name="DeregisterForm">
     <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>287</width>
-            <height>82</height>
-        </rect>
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>287</width>
+        <height>82</height>
+      </rect>
     </property>
     <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>0</hsizetype>
-            <vsizetype>0</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
+      <sizepolicy>
+        <hsizetype>0</hsizetype>
+        <vsizetype>0</vsizetype>
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+      </sizepolicy>
     </property>
-    <property name="caption">
-        <string>Twinkle - Deregister</string>
+    <property name="windowTitle">
+      <string>Twinkle - Deregister</string>
     </property>
-    <vbox>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QCheckBox">
-            <property name="name">
-                <cstring>deregAllCheckBox</cstring>
-            </property>
-            <property name="text">
-                <string>deregister all devices</string>
-            </property>
-        </widget>
-        <widget class="QLayoutWidget">
-            <property name="name">
-                <cstring>layout21</cstring>
-            </property>
-            <hbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <spacer>
-                    <property name="name">
-                        <cstring>spacer13</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>111</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget class="QPushButton">
-                    <property name="name">
-                        <cstring>okPushButton</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;OK</string>
-                    </property>
-                    <property name="default">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="QPushButton">
-                    <property name="name">
-                        <cstring>cancelPushButton</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Cancel</string>
-                    </property>
-                </widget>
-            </hbox>
+    <layout class="QVBoxLayout">
+      <item>
+        <widget class="QCheckBox" name="deregAllCheckBox">
+          <property name="text">
+            <string>deregister all devices</string>
+          </property>
         </widget>
-    </vbox>
-</widget>
-<connections>
+      </item>
+      <item>
+        <layout class="QHBoxLayout">
+          <item>
+            <spacer name="spacer13">
+              <property name="sizeHint">
+                <size>
+                  <width>111</width>
+                  <height>20</height>
+                </size>
+              </property>
+              <property name="sizeType">
+                <enum>QSizePolicy::Expanding</enum>
+              </property>
+              <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+              </property>
+            </spacer>
+          </item>
+          <item>
+            <widget class="QPushButton" name="okPushButton">
+              <property name="text">
+                <string>&amp;OK</string>
+              </property>
+              <property name="default">
+                <bool>true</bool>
+              </property>
+            </widget>
+          </item>
+          <item>
+            <widget class="QPushButton" name="cancelPushButton">
+              <property name="text">
+                <string>&amp;Cancel</string>
+              </property>
+            </widget>
+          </item>
+        </layout>
+      </item>
+    </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11"/>
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+  <connections>
     <connection>
-        <sender>okPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DeregisterForm</receiver>
-        <slot>accept()</slot>
+      <sender>okPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DeregisterForm</receiver>
+      <slot>accept()</slot>
     </connection>
     <connection>
-        <sender>cancelPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DeregisterForm</receiver>
-        <slot>reject()</slot>
+      <sender>cancelPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DeregisterForm</receiver>
+      <slot>reject()</slot>
     </connection>
-</connections>
-<includes>
-    <include location="local" impldecl="in implementation">deregisterform.ui.h</include>
-</includes>
-<pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+  </connections>
+</ui>
diff --git a/src/gui/deregisterform.ui.h b/src/gui/deregisterform.ui.h
deleted file mode 100644
index 2aae11c..0000000
--- a/src/gui/deregisterform.ui.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/****************************************************************************
-** ui.h extension file, included from the uic-generated form implementation.
-**
-** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
-** init() function in place of a constructor, and a destroy() function in
-** place of a destructor.
-*****************************************************************************/
-/*
-    Copyright (C) 2005-2009  Michel de Boer <michel@twinklephone.com>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
diff --git a/src/gui/twinkle.pro b/src/gui/twinkle.pro
index ba9b51b..78e8a8e 100644
--- a/src/gui/twinkle.pro
+++ b/src/gui/twinkle.pro
@@ -11,6 +11,7 @@ INCLUDEPATH	+= ..
 
 HEADERS	+= gui.h \
 	dtmfform.h \
+	deregisterform.h \
 	historylistview.h \
 	freedesksystray.h \
 	twinklesystray.h \
@@ -28,6 +29,7 @@ HEADERS	+= gui.h \
 SOURCES	+= main.cpp \
 	gui.cpp \
 	dtmfform.cpp \
+	deregisterform.cpp \
 	historylistview.cpp \
 	freedesksystray.cpp \
 	twinklesystray.cpp \
@@ -38,12 +40,12 @@ SOURCES	+= main.cpp \
 	buddylistview.cpp \
 	twinkleapplication.cpp
 
-FORMS	= dtmfform.ui
+FORMS	= dtmfform.ui \
+	deregisterform.ui
 
 #The following line was changed from FORMS to FORMS3 by qt3to4
 FORMS3	= mphoneform.ui \
 	inviteform.ui \
-	deregisterform.ui \
 	redirectform.ui \
 	termcapform.ui \
 	selectnicform.ui \