Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 7 insertions, 5 deletions

diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h
index d3f7022c..7abcf22f 100644
--- a/kaddressbook/viewconfigurewidget.h
+++ b/kaddressbook/viewconfigurewidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef VIEWCONFIGUREWIDGET_H
@@ -48,9 +48,10 @@ class ViewConfigureFilterPage;
 class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+    ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 );
     virtual ~ViewConfigureWidget();
 
     /**
@@ -74,7 +75,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
     /**
       Use this method to add new pages to the widget.
      */
-    TQVBox *addPage( const TQString &item, const TQString &header = TQString::null,
+    TQVBox *addPage( const TQString &item, const TQString &header = TQString(),
                     const TQPixmap &pixmap = TQPixmap() );
 
   private:
@@ -87,10 +88,11 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
 class ViewConfigureDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     ViewConfigureDialog( ViewConfigureWidget *wdg, const TQString &viewName,
-                         TQWidget *parent, const char *name = 0 );
+                         TQWidget *tqparent, const char *name = 0 );
     ~ViewConfigureDialog();
 
     void restoreSettings( KConfig* );