TQt4 port kdewebdev

This enables compilation under both Qt3 and Qt4


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

4 files changed, 14 insertions, 13 deletions

diff --git a/kommander/working/plugintemplate/plugin.cpp b/kommander/working/plugintemplate/plugin.cpp
index b6e1a0a0..bad414aa 100644
--- a/kommander/working/plugintemplate/plugin.cpp
+++ b/kommander/working/plugintemplate/plugin.cpp
@@ -11,7 +11,7 @@ class %{APPNAME}Plugin : public KommanderPlugin
 {
 public:
     %{APPNAME}Plugin();
-    virtual TQWidget *create( const TQString &className, TQWidget *parent = 0, const char *name = 0);
+    virtual TQWidget *create( const TQString &className, TQWidget *tqparent = 0, const char *name = 0);
 };
 
 %{APPNAME}Plugin::%{APPNAME}Plugin()
@@ -19,10 +19,10 @@ public:
     addWidget( "%{APPNAME}", "Custom", i18n("Kommander %{APPNAME} plugin."), new TQIconSet(KGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium)) );
 }
 
-TQWidget *%{APPNAME}Plugin::create( const TQString &className, TQWidget *parent, const char *name)
+TQWidget *%{APPNAME}Plugin::create( const TQString &className, TQWidget *tqparent, const char *name)
 {
   if (className == "%{APPNAME}")
-    return new %{APPNAME}(parent, name);
+    return new %{APPNAME}(tqparent, name);
   return 0;
 }
 
diff --git a/kommander/working/plugintemplate/src-Makefile.am b/kommander/working/plugintemplate/src-Makefile.am
index eb7dbe9d..a7b2ee01 100644
--- a/kommander/working/plugintemplate/src-Makefile.am
+++ b/kommander/working/plugintemplate/src-Makefile.am
@@ -13,7 +13,7 @@ libkmdr%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp %{APPNAMELC}plugin.cpp
 
 # these are the headers for your project that won't be installed
 
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
 METASOURCES = AUTO
 AM_CXXFLAGS= -DHAVE_SSTREAM
 AM_CPPFLAGS= $(all_includes)
diff --git a/kommander/working/plugintemplate/widget.cpp b/kommander/working/plugintemplate/widget.cpp
index 2378e87a..7efd8526 100644
--- a/kommander/working/plugintemplate/widget.cpp
+++ b/kommander/working/plugintemplate/widget.cpp
@@ -10,14 +10,14 @@
 
 
 enum Functions {
-  FirstFunction = 11001, //CHANGE THIS NUMBE TO AN UNIQUE ONE!!!
+  FirstFunction = 11001, //CHANGE THIS NUMBE TO AN UNITQUE ONE!!!
   Function1,
   Function2,
   LastFunction
 };
 
-%{APPNAME}::%{APPNAME}(TQWidget *parent, const char *name)
-  : TQWidget(parent, name), KommanderWidget(this)
+%{APPNAME}::%{APPNAME}(TQWidget *tqparent, const char *name)
+  : TQWidget(tqparent, name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
@@ -31,7 +31,7 @@ enum Functions {
     setPixmap(KGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium));
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setLineWidth(1);
-    setAlignment(Qt::AlignCenter);
+    tqsetAlignment(TQt::AlignCenter);
   }
   else
     setHidden(true);
@@ -110,7 +110,7 @@ TQString %{APPNAME}::handleDCOP(int function, const TQStringList& args)
     default:
       return KommanderWidget::handleDCOP(function, args);
   }
-  return TQString::null;
+  return TQString();
 }
 
 #include "%{APPNAMELC}.moc"
diff --git a/kommander/working/plugintemplate/widget.h b/kommander/working/plugintemplate/widget.h
index 22638875..ab6f042f 100644
--- a/kommander/working/plugintemplate/widget.h
+++ b/kommander/working/plugintemplate/widget.h
@@ -15,13 +15,14 @@ class TQStringList;
 class %{APPNAME}: public TQWidget, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 
 public:  
-  %{APPNAME}(TQWidget *parent, const char* name);
+  %{APPNAME}(TQWidget *tqparent, const char* name);
   ~%{APPNAME}();
 
   virtual bool isKommanderWidget() const;