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, 10 insertions, 9 deletions

diff --git a/kommander/pluginmanager/main.cpp b/kommander/pluginmanager/main.cpp
index 74561925..0e663476 100644
--- a/kommander/pluginmanager/main.cpp
+++ b/kommander/pluginmanager/main.cpp
@@ -77,18 +77,18 @@ int main(int argc, char *argv[])
     QCStringList items = args->getOptionList("add");
     for (QCStringList::ConstIterator it = items.begin(); it != items.end(); ++it)
       if (!P.add(*it))
-        cerr << i18n("Error adding plugin '%1'").arg(*it).local8Bit();
+        cerr << i18n("Error adding plugin '%1'").tqarg((*it).data()).local8Bit().data();
     
     items = args->getOptionList("remove");
     for (QCStringList::ConstIterator it = items.begin(); it != items.end(); ++it)
       if (!P.remove(*it))
-        cerr << i18n("Error removing plugin '%1'").arg(*it).local8Bit();
+        cerr << i18n("Error removing plugin '%1'").tqarg((*it).data()).local8Bit().data();
     
     if (args->isSet("list"))
     {
       TQStringList plugins = P.items();
       for (TQStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
-        cout << (*it).local8Bit() << "\n";
+        cout << (*it).local8Bit().data() << "\n";
     }
   }
   else 
diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp
index 94d365f5..c2947c5b 100644
--- a/kommander/pluginmanager/mainwindow.cpp
+++ b/kommander/pluginmanager/mainwindow.cpp
@@ -28,8 +28,8 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 
-MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f )
-    : KMainWindow( parent, name, f )
+MainWindow::MainWindow( TQWidget* tqparent, const char *name, WFlags f )
+    : KMainWindow( tqparent, name, f )
 {
   KToolBar *toolBar = new KToolBar( this );
   toolBar->insertButton("fileopen", Add, true, i18n("Add") );
@@ -77,7 +77,7 @@ void MainWindow::add(const TQString &plugin)
 {
   if (!m_pluginManager->add(plugin))
   {
-    TQString errMsg = i18n("<qt>Unable to load Kommander plugin<br><b>%1</b></qt>").arg(plugin);
+    TQString errMsg = i18n("<qt>Unable to load Kommander plugin<br><b>%1</b></qt>").tqarg(plugin);
     KMessageBox::error(this, errMsg, i18n("Cannot add plugin"));
   }
   else
diff --git a/kommander/pluginmanager/mainwindow.h b/kommander/pluginmanager/mainwindow.h
index c774832f..ffc59ace 100644
--- a/kommander/pluginmanager/mainwindow.h
+++ b/kommander/pluginmanager/mainwindow.h
@@ -26,8 +26,9 @@ class PluginManager;
 class MainWindow : public KMainWindow
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  MainWindow( TQWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose );
+  MainWindow( TQWidget* tqparent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose );
   ~MainWindow();
 
 protected slots:
diff --git a/kommander/pluginmanager/pluginmanager.cpp b/kommander/pluginmanager/pluginmanager.cpp
index 79da4d81..2bfbab89 100644
--- a/kommander/pluginmanager/pluginmanager.cpp
+++ b/kommander/pluginmanager/pluginmanager.cpp
@@ -47,7 +47,7 @@ bool PluginManager::add(const TQString& plugin, bool)
   TQString plugName= libraryName(plugin);
   if (plugName.isNull())
     return false;
-  if (m_list->contains(plugName))
+  if (m_list->tqcontains(plugName))
     return false;
   m_list->append(plugName);
   return true;
@@ -55,7 +55,7 @@ bool PluginManager::add(const TQString& plugin, bool)
 
 bool PluginManager::remove(const TQString& plugin)
 {
-  if (!m_list->contains(plugin))
+  if (!m_list->tqcontains(plugin))
     return false;
   m_list->remove(plugin);
   return true;