TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 6 insertions, 5 deletions

diff --git a/kdict/options.h b/kdict/options.h
index 239b52ef..a0b1cfe8 100644
--- a/kdict/options.h
+++ b/kdict/options.h
@@ -74,7 +74,7 @@ public:
 
   bool defineClipboard;           // define clipboard content on startup?
 
-  TQSize optSize,setsSize,matchSize;      // window geometry
+  TQSize optSize,setsSize,matchSize;      // window tqgeometry
   bool showMatchList;
   TQValueList<int> splitterSizes;
 
@@ -111,10 +111,11 @@ extern GlobalData *global;
 class OptionsDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-  OptionsDialog(TQWidget *parent=0, const char *name=0);
+  OptionsDialog(TQWidget *tqparent=0, const char *name=0);
   ~OptionsDialog();
 
   //===================================================================================
@@ -123,7 +124,7 @@ public:
 
     public:
       // alwaysIgnore==false: enter is ignored when the widget isn't visible/out of focus
-      DialogListBox(bool alwaysIgnore=false, TQWidget * parent=0, const char * name=0);
+      DialogListBox(bool alwaysIgnore=false, TQWidget * tqparent=0, const char * name=0);
       ~DialogListBox();
 
     protected:
@@ -137,7 +138,7 @@ public:
   class ColorListItem : public TQListBoxText {
 
     public:
-      ColorListItem( const TQString &text, const TQColor &color=Qt::black );
+      ColorListItem( const TQString &text, const TQColor &color=TQt::black );
       ~ColorListItem();
       const TQColor& color()                     { return mColor; }
       void  setColor( const TQColor &color )     { mColor = color; }
@@ -217,7 +218,7 @@ private:
               *f_ntDefBtn,
               *f_ntChngBtn;
 
-  TQFrame *layoutTab;
+  TQFrame *tqlayoutTab;
   TQRadioButton *w_layout[3];
 
   TQFrame *otherTab;