TQt4 port kdeutils

This enables compilation under both Qt3 and Qt4


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

7 files changed, 35 insertions, 32 deletions

diff --git a/ksim/monitors/filesystem/filesystemstats.cpp b/ksim/monitors/filesystem/filesystemstats.cpp
index 1aa156d..fa215fc 100644
--- a/ksim/monitors/filesystem/filesystemstats.cpp
+++ b/ksim/monitors/filesystem/filesystemstats.cpp
@@ -184,7 +184,7 @@ FilesystemStats::List FilesystemStats::readEntries()
 #endif
 
 #ifdef USE_FAILSAFE
-  TQFile file( TQString::fromLatin1( _PATH_MOUNTED ) );
+  TQFile file( TQString::tqfromLatin1( _PATH_MOUNTED ) );
 
   if ( !file.open( IO_ReadOnly ) )
     return list;
diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp
index aca7694..5d20213 100644
--- a/ksim/monitors/filesystem/filesystemwidget.cpp
+++ b/ksim/monitors/filesystem/filesystemwidget.cpp
@@ -85,8 +85,8 @@ void FilesystemWidget::Filesystem::setValue(int value)
   m_display->setValue(value);
 }
 
-FilesystemWidget::FilesystemWidget(TQWidget *parent, const char *name)
-   : TQWidget(parent, name)
+FilesystemWidget::FilesystemWidget(TQWidget *tqparent, const char *name)
+   : TQWidget(tqparent, name)
 {
   m_list.setAutoDelete(true);
   m_layout = new TQVBoxLayout(this);
@@ -141,7 +141,7 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e)
   while ((filesystem = it.current()) != 0) {
     ++it;
 
-    if (filesystem->display() == o) {
+    if (TQT_BASE_OBJECT(filesystem->display()) == TQT_BASE_OBJECT(o)) {
       progressBar = filesystem->display();
       break;
     }
@@ -149,17 +149,17 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e)
     ++i;
   }
 
-  if (o == progressBar && e->type() == TQEvent::MouseButtonPress)
+  if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(progressBar) && e->type() == TQEvent::MouseButtonPress)
   {
-    switch(static_cast<TQMouseEvent *>(e)->button()) {
-      case TQMouseEvent::RightButton:
+    switch(TQT_TQMOUSEEVENT(e)->button()) {
+      case Qt::RightButton:
         showMenu(i);
         break;
       default:
         break;
-      case TQMouseEvent::LeftButton:
-        if (parentWidget()->inherits("KSim::PluginView"))
-          static_cast<KSim::PluginView *>(parentWidget())->doCommand();
+      case Qt::LeftButton:
+        if (tqparentWidget()->inherits("KSim::PluginView"))
+          static_cast<KSim::PluginView *>(tqparentWidget())->doCommand();
         break;
     }
 
@@ -188,11 +188,11 @@ void FilesystemWidget::processExited(KProcess *)
 
   TQStringList::Iterator it;
   for (it = errorList.begin(); it != errorList.end(); ++it) {
-    message += TQString::fromLatin1("<li>%1</li>")
-       .arg((*it).replace(TQRegExp("[u]?mount: "), TQString::null));
+    message += TQString::tqfromLatin1("<li>%1</li>")
+       .tqarg((*it).tqreplace(TQRegExp("[u]?mount: "), TQString()));
   }
 
-  message += TQString::fromLatin1("</ul></qt>");
+  message += TQString::tqfromLatin1("</ul></qt>");
   KMessageBox::sorry(0, message);
 }
 
diff --git a/ksim/monitors/filesystem/filesystemwidget.h b/ksim/monitors/filesystem/filesystemwidget.h
index 16e1190..b709125 100644
--- a/ksim/monitors/filesystem/filesystemwidget.h
+++ b/ksim/monitors/filesystem/filesystemwidget.h
@@ -27,11 +27,12 @@
 class KProcess;
 class TQVBoxLayout;
 
-class FilesystemWidget : public QWidget
+class FilesystemWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    FilesystemWidget(TQWidget *parent, const char *name);
+    FilesystemWidget(TQWidget *tqparent, const char *name);
     ~FilesystemWidget();
 
     void append(int, const TQString &);
diff --git a/ksim/monitors/filesystem/fsystemconfig.cpp b/ksim/monitors/filesystem/fsystemconfig.cpp
index 67026d1..a91eae0 100644
--- a/ksim/monitors/filesystem/fsystemconfig.cpp
+++ b/ksim/monitors/filesystem/fsystemconfig.cpp
@@ -34,20 +34,20 @@
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 
-class FSysViewItem : public QCheckListItem
+class FSysViewItem : public TQCheckListItem
 {
   public:
-    FSysViewItem(TQListView *parent, const TQString &text1,
+    FSysViewItem(TQListView *tqparent, const TQString &text1,
        const TQString &text2, const TQString &text3)
-        : TQCheckListItem(parent, text1, CheckBox)
+        : TQCheckListItem(tqparent, text1, CheckBox)
     {
       setText(1, text2);
       setText(2, text3);
     }
 };
 
-FsystemConfig::FsystemConfig(KSim::PluginObject *parent, const char *name)
-   : KSim::PluginPage(parent, name)
+FsystemConfig::FsystemConfig(KSim::PluginObject *tqparent, const char *name)
+   : KSim::PluginPage(tqparent, name)
 {
   m_mainLayout = new TQGridLayout(this);
   m_mainLayout->setSpacing(6);
@@ -71,7 +71,7 @@ FsystemConfig::FsystemConfig(KSim::PluginObject *parent, const char *name)
 
   m_intervalLabel = new TQLabel(this);
   m_intervalLabel->setText( i18n("Update interval:"));
-  m_intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
+  m_intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
      TQSizePolicy::Fixed));
   m_mainLayout->addMultiCellWidget(m_intervalLabel, 3, 3, 0, 0);
 
@@ -82,7 +82,7 @@ FsystemConfig::FsystemConfig(KSim::PluginObject *parent, const char *name)
 
   TQLabel *intervalLabel = new TQLabel(this);
   intervalLabel->setText(i18n("seconds"));
-  intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
+  intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
      TQSizePolicy::Fixed));
   m_mainLayout->addMultiCellWidget(intervalLabel, 3, 3, 2, 2);
 
@@ -107,7 +107,7 @@ void FsystemConfig::readConfig()
   TQStringList list = config()->readListEntry("mountEntries");
   for (TQListViewItemIterator it(m_availableMounts); it.current(); ++it) {
     TQString string = it.current()->text(0) + ":" + splitString(it.current()->text(0));
-    static_cast<TQCheckListItem *>(it.current())->setOn(list.contains(string) > 0);
+    static_cast<TQCheckListItem *>(it.current())->setOn(list.tqcontains(string) > 0);
   }
 }
 
@@ -155,7 +155,7 @@ void FsystemConfig::getStats()
     if ( !FilesystemStats::readStats( ( *it ).dir, total, free ) )
       continue;
 
-    if ( !m_availableMounts->findItem( ( *it ).dir, 0 ) )
+    if ( !m_availableMounts->tqfindItem( ( *it ).dir, 0 ) )
     {
       (void) new FSysViewItem( m_availableMounts, ( *it ).dir,
          ( *it ).fsname, ( *it ).type );
@@ -169,7 +169,7 @@ void FsystemConfig::getStats()
   TQStringList list = config()->readListEntry("mountEntries");
   for (TQListViewItemIterator it(m_availableMounts); it.current(); ++it) {
     TQString string = it.current()->text(0) + ":" + splitString(it.current()->text(0));
-    static_cast<TQCheckListItem *>(it.current())->setOn(list.contains(string) > 0);
+    static_cast<TQCheckListItem *>(it.current())->setOn(list.tqcontains(string) > 0);
   }
 }
 
@@ -178,7 +178,7 @@ TQString FsystemConfig::splitString(const TQString &string) const
   if (string == "/" || !m_splitNames->isChecked())
     return string;
 
-  int location = string.findRev("/");
+  int location = string.tqfindRev("/");
   TQString newString(string);
   return newString.remove(0, location + 1);
 }
diff --git a/ksim/monitors/filesystem/fsystemconfig.h b/ksim/monitors/filesystem/fsystemconfig.h
index 283a501..96fccf1 100644
--- a/ksim/monitors/filesystem/fsystemconfig.h
+++ b/ksim/monitors/filesystem/fsystemconfig.h
@@ -33,8 +33,9 @@ class TQListBoxItem;
 class FsystemConfig : public KSim::PluginPage
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    FsystemConfig(KSim::PluginObject *parent, const char *name);
+    FsystemConfig(KSim::PluginObject *tqparent, const char *name);
     ~FsystemConfig();
 
     virtual void saveConfig();
diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp
index 039447a..f73ce3d 100644
--- a/ksim/monitors/filesystem/ksimfsystem.cpp
+++ b/ksim/monitors/filesystem/ksimfsystem.cpp
@@ -81,9 +81,9 @@ void PluginModule::showAbout()
   KAboutApplication(&aboutData).exec();
 }
 
-Fsystem::Fsystem(KSim::PluginObject *parent, const char *name)
+Fsystem::Fsystem(KSim::PluginObject *tqparent, const char *name)
    : DCOPObject("fsystem"),
-   KSim::PluginView(parent, name)
+   KSim::PluginView(tqparent, name)
 {
   config()->setGroup("Fsystem");
   TQVBoxLayout *vbLayout = new TQVBoxLayout(this);
@@ -193,7 +193,7 @@ Fsystem::MountEntryList Fsystem::makeList(const TQStringList &list) const
   TQStringList::ConstIterator it;
   for (it = list.begin(); it != list.end(); ++it) {
     splitList = TQStringList::split(":", (*it));
-    newList.append(qMakePair(splitList[0], splitList[1]));
+    newList.append(tqMakePair(splitList[0], splitList[1]));
   }
 
   return newList;
diff --git a/ksim/monitors/filesystem/ksimfsystem.h b/ksim/monitors/filesystem/ksimfsystem.h
index d945820..cf8dc9e 100644
--- a/ksim/monitors/filesystem/ksimfsystem.h
+++ b/ksim/monitors/filesystem/ksimfsystem.h
@@ -48,11 +48,12 @@ class PluginModule : public KSim::PluginObject
 class Fsystem : public KSim::PluginView, public FsystemIface
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
     /**
      * construtor of Fsystem, calls all init functions to create the plugin.
      */
-    Fsystem(KSim::PluginObject *parent, const char *name);
+    Fsystem(KSim::PluginObject *tqparent, const char *name);
     ~Fsystem();
 
     virtual void reparseConfig();
@@ -65,7 +66,7 @@ class Fsystem : public KSim::PluginView, public FsystemIface
     void updateFS();
 
   private:
-    typedef TQValueList<QPair<TQString, TQString> > MountEntryList;
+    typedef TQValueList<TQPair<TQString, TQString> > MountEntryList;
     MountEntryList makeList(const TQStringList &list) const;
 
     FilesystemWidget *m_widget;