TQt4 port kdegraphics

This enables compilation under both Qt3 and Qt4


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

10 files changed, 66 insertions, 61 deletions

diff --git a/kmrml/kmrml/kcontrol/indexcleaner.cpp b/kmrml/kmrml/kcontrol/indexcleaner.cpp
index 56e606aa..b02d6343 100644
--- a/kmrml/kmrml/kcontrol/indexcleaner.cpp
+++ b/kmrml/kmrml/kcontrol/indexcleaner.cpp
@@ -6,17 +6,17 @@
 
 #include <kdeversion.h>
 #if KDE_VERSION < 306
-  #define QUOTE( x ) x
+  #define TQUOTE( x ) x
 #else
-  #define QUOTE( x ) KProcess::quote( x )
+  #define TQUOTE( x ) KProcess::quote( x )
 #endif
 
 using namespace KMrmlConfig;
 
 IndexCleaner::IndexCleaner( const TQStringList& dirs,
                             const KMrml::Config *config,
-                            TQObject *parent, const char *name )
-    : TQObject( parent, name ),
+                            TQObject *tqparent, const char *name )
+    : TQObject( tqparent, name ),
       m_dirs( dirs ),
       m_config( config ),
       m_process( 0L )
@@ -74,11 +74,11 @@ void IndexCleaner::startNext()
     TQString dir = m_dirs.first();
     m_dirs.pop_front();
 
-    int index = cmd.find( "%d" );
+    int index = cmd.tqfind( "%d" );
     if ( index != -1 )
-        cmd.replace( index, 2, QUOTE( dir ) );
+        cmd.tqreplace( index, 2, TQUOTE( dir ) );
     else // no %d? What else can we do?
-        cmd.append( TQString::fromLatin1(" ") + QUOTE( dir ) );
+        cmd.append( TQString::tqfromLatin1(" ") + TQUOTE( dir ) );
 
     *m_process << cmd;
 
diff --git a/kmrml/kmrml/kcontrol/indexcleaner.h b/kmrml/kmrml/kcontrol/indexcleaner.h
index 92dcdc22..afc2ebfd 100644
--- a/kmrml/kmrml/kcontrol/indexcleaner.h
+++ b/kmrml/kmrml/kcontrol/indexcleaner.h
@@ -20,13 +20,14 @@ namespace KMrml
 
 namespace KMrmlConfig
 {
-    class IndexCleaner : public QObject
+    class IndexCleaner : public TQObject
     {
         Q_OBJECT
+  TQ_OBJECT
 
     public:
         IndexCleaner( const TQStringList& dirs, const KMrml::Config *config,
-                      TQObject *parent = 0, const char *name = 0 );
+                      TQObject *tqparent = 0, const char *name = 0 );
         ~IndexCleaner();
 
         void start();
diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp
index f4c4b108..0308dd39 100644
--- a/kmrml/kmrml/kcontrol/indexer.cpp
+++ b/kmrml/kmrml/kcontrol/indexer.cpp
@@ -28,16 +28,16 @@
 
 #include <kdeversion.h>
 #if KDE_VERSION < 306
-  #define QUOTE( x ) x
+  #define TQUOTE( x ) x
 #else
-  #define QUOTE( x ) KProcess::quote( x )
+  #define TQUOTE( x ) KProcess::quote( x )
 #endif
 
 using namespace KMrmlConfig;
 
 Indexer::Indexer( const KMrml::Config* config,
-                  TQObject *parent, const char *name )
-    : TQObject( parent, name ),
+                  TQObject *tqparent, const char *name )
+    : TQObject( tqparent, name ),
       m_config( config ),
       m_dirCount( 0 )
 {
@@ -93,14 +93,14 @@ void Indexer::processNext()
 
     TQString cmd = m_config->addCollectionCommandLine().simplifyWhiteSpace().stripWhiteSpace();
 
-    // in the commandline, replace %d with the directory to process and
+    // in the commandline, tqreplace %d with the directory to process and
     // %t with the thumbnail dir
-    int index = cmd.find( "%d" ); // ### TQFile::encodeName()?
+    int index = cmd.tqfind( "%d" ); // ### TQFile::encodeName()?
     if ( index != -1 )
-        cmd.replace( index, 2, QUOTE( m_currentDir ) );
-    index = cmd.find( "%t" );
+        cmd.tqreplace( index, 2, TQUOTE( m_currentDir ) );
+    index = cmd.tqfind( "%t" );
     if ( index != -1 )
-        cmd.replace( index, 2, QUOTE(m_currentDir + "_thumbnails") );
+        cmd.tqreplace( index, 2, TQUOTE(m_currentDir + "_thumbnails") );
 
 //     qDebug("****** command: %s", cmd.latin1());
 #if KDE_VERSION >= 306
@@ -112,7 +112,7 @@ void Indexer::processNext()
          *m_process << *it;
 #endif
 
-    emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").arg( m_currentDir ));
+    emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").tqarg( m_currentDir ));
     m_process->start();
 }
 
@@ -160,7 +160,7 @@ void Indexer::slotCanRead( KProcIO *proc )
                     if ( ok )
                     {
                         uint dirsLeft = m_dirs.count();
-                        TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").arg( m_dirCount - dirsLeft ).arg( m_dirCount).arg( m_currentDir ).arg( currentFile ).arg( numFiles );
+                        TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").tqarg( m_dirCount - dirsLeft ).tqarg( m_dirCount).tqarg( m_currentDir ).tqarg( currentFile ).tqarg( numFiles );
                         emit progress( perc, message );
                     }
                 }
diff --git a/kmrml/kmrml/kcontrol/indexer.h b/kmrml/kmrml/kcontrol/indexer.h
index 290c9937..d9fede24 100644
--- a/kmrml/kmrml/kcontrol/indexer.h
+++ b/kmrml/kmrml/kcontrol/indexer.h
@@ -28,13 +28,14 @@ class KProcIO;
 
 namespace KMrmlConfig
 {
-    class Indexer : public QObject
+    class Indexer : public TQObject
     {
         Q_OBJECT
+  TQ_OBJECT
 
     public:
         Indexer( const KMrml::Config *config,
-                 TQObject *parent = 0L, const char *name = 0 );
+                 TQObject *tqparent = 0L, const char *name = 0 );
         ~Indexer();
 
         void startIndexing( const TQStringList& dirs );
diff --git a/kmrml/kmrml/kcontrol/indextest.h b/kmrml/kmrml/kcontrol/indextest.h
index 15cda2ce..91320d2e 100644
--- a/kmrml/kmrml/kcontrol/indextest.h
+++ b/kmrml/kmrml/kcontrol/indextest.h
@@ -8,9 +8,10 @@
 #ifndef INDEXTEST_H
 #define INDEXTEST_H
 
-class IndexTest : public QObject
+class IndexTest : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
     IndexTest();
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
index d2b60fc0..3bff026a 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
@@ -43,8 +43,8 @@ static const int COL_FILENAME = 1;
 typedef KGenericFactory<KCMKMrml, TQWidget> MrmlFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kmrml, MrmlFactory("kmrml") )
 
-KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ):
-    KCModule(MrmlFactory::instance(), parent, name)
+KCMKMrml::KCMKMrml(TQWidget *tqparent, const char *name, const TQStringList & ):
+    KCModule(MrmlFactory::instance(), tqparent, name)
 {
     KAboutData* ab = new KAboutData(
         "kcmkmrml",
@@ -58,11 +58,11 @@ KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ):
     ab->addAuthor( "Carsten Pfeiffer", 0, "pfeiffer@kde.org" );
     setAboutData( ab );
 
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->setSpacing( KDialog::spacingHint() );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->setSpacing( KDialog::spacingHint() );
     m_mainPage = new MainPage( this, "main page" );
 
-    layout->addWidget( m_mainPage );
+    tqlayout->addWidget( m_mainPage );
 
     connect( m_mainPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool )));
 
@@ -86,11 +86,11 @@ void KCMKMrml::checkGiftInstallation()
         KMessageBox::error( this, errorMessage );
         m_mainPage->hide();
         TQLabel *errorLabel = new TQLabel( errorMessage, this );
-        errorLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
-        KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString::null, this ); 
-        urlLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+        errorLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+        KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString(), this ); 
+        urlLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
         connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& )), kapp, TQT_SLOT( invokeBrowser( const TQString& )) );
-        TQLayout *l = layout();
+        TQLayout *l = tqlayout();
         l->addItem( new TQSpacerItem( 0, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
         l->add( errorLabel );
         l->add( urlLabel );
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.h b/kmrml/kmrml/kcontrol/kcmkmrml.h
index 306e55f0..1c15a0a2 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.h
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.h
@@ -31,9 +31,10 @@ namespace KMrmlConfig
     class KCMKMrml : public KCModule
     {
         Q_OBJECT
+  TQ_OBJECT
     
     public:
-        KCMKMrml(TQWidget *parent, const char *name, const TQStringList &);
+        KCMKMrml(TQWidget *tqparent, const char *name, const TQStringList &);
         virtual ~KCMKMrml();
 
         virtual void defaults();
diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp
index c4e65ac3..ab6fc84b 100644
--- a/kmrml/kmrml/kcontrol/mainpage.cpp
+++ b/kmrml/kmrml/kcontrol/mainpage.cpp
@@ -50,8 +50,8 @@
 using namespace KMrmlConfig;
 
 
-MainPage::MainPage( TQWidget *parent, const char *name )
-    : TQVBox( parent, name ),
+MainPage::MainPage( TQWidget *tqparent, const char *name )
+    : TQVBox( tqparent, name ),
       m_indexer( 0L ),
       m_indexCleaner( 0L ),
       m_progressDialog( 0L ),
@@ -132,7 +132,7 @@ void MainPage::resetDefaults()
 
     m_listBox->clear();
 
-    // slotHostChanged(); not necessary, will be called by Qt signals
+    // slotHostChanged(); not necessary, will be called by TQt signals
     slotUseAuthChanged( m_serverWidget->m_useAuth->isChecked() );
 
     blockSignals( false );
@@ -151,7 +151,7 @@ void MainPage::load()
     m_listBox->clear();
     m_listBox->insertStringList( m_config->indexableDirectories() );
 
-    // slotHostChanged(); not necessary, will be called by Qt signals
+    // slotHostChanged(); not necessary, will be called by TQt signals
     slotUseAuthChanged( m_serverWidget->m_useAuth->isChecked() );
 
     blockSignals( false );
@@ -186,7 +186,7 @@ TQStringList MainPage::difference( const TQStringList& oldIndexDirs,
 {
     TQStringList result;
 
-    TQString slash = TQString::fromLatin1("/");
+    TQString slash = TQString::tqfromLatin1("/");
     TQStringList::ConstIterator oldIt = oldIndexDirs.begin();
     TQString oldDir, newDir;
 
@@ -341,7 +341,7 @@ void MainPage::slotRemoveClicked()
 void MainPage::enableWidgetsFor( const KMrml::ServerSettings& settings )
 {
     TQString host = settings.host;
-    bool enableWidgets = (m_config->hosts().findIndex( host ) > -1);
+    bool enableWidgets = (m_config->hosts().tqfindIndex( host ) > -1);
     m_serverWidget->m_addButton->setEnabled(!enableWidgets && !host.isEmpty());
     m_serverWidget->m_removeButton->setEnabled( enableWidgets &&
                                                 !host.isEmpty() &&
@@ -397,7 +397,7 @@ void MainPage::processIndexDirs( const TQStringList& removeDirs )
 
     if ( !removeDirs.isEmpty() )
     {
-        m_indexCleaner = new IndexCleaner( removeDirs, m_config, this );
+        m_indexCleaner = new IndexCleaner( removeDirs, m_config, TQT_TQOBJECT(this) );
         connect( m_indexCleaner, TQT_SIGNAL( advance( int ) ),
                  m_progressDialog->progressBar(), TQT_SLOT( advance( int ) ));
         connect( m_indexCleaner, TQT_SIGNAL( finished() ),
@@ -437,7 +437,7 @@ void MainPage::slotMaybeIndex()
     m_progressDialog->progressBar()->setProgress( 0 );
 
     // do the indexing
-    m_indexer = new Indexer( m_config, this, "Indexer" );
+    m_indexer = new Indexer( m_config, TQT_TQOBJECT(this), "Indexer" );
     connect( m_indexer, TQT_SIGNAL( progress( int, const TQString& )),
              TQT_SLOT( slotIndexingProgress( int, const TQString& ) ));
     connect( m_indexer, TQT_SIGNAL( finished( int )),
@@ -465,7 +465,7 @@ void MainPage::slotIndexingFinished( int returnCode )
             if ( err )
                 syserr = TQString::fromLocal8Bit( err );
             else
-                syserr = i18n("Unknown error: %1").arg( returnCode );
+                syserr = i18n("Unknown error: %1").tqarg( returnCode );
         }
 
         KMessageBox::detailedError( this, i18n("An error occurred during indexing. The index might be invalid."),
diff --git a/kmrml/kmrml/kcontrol/mainpage.h b/kmrml/kmrml/kcontrol/mainpage.h
index 8000aea9..7a7d6902 100644
--- a/kmrml/kmrml/kcontrol/mainpage.h
+++ b/kmrml/kmrml/kcontrol/mainpage.h
@@ -43,12 +43,13 @@ namespace KMrmlConfig
     class Indexer;
     class IndexCleaner;
 
-    class MainPage : public QVBox
+    class MainPage : public TQVBox
     {
         Q_OBJECT
+  TQ_OBJECT
 
     public:
-        MainPage( TQWidget *parent, const char *name );
+        MainPage( TQWidget *tqparent, const char *name );
         ~MainPage();
 
         void resetDefaults();
diff --git a/kmrml/kmrml/kcontrol/serverconfigwidget.ui b/kmrml/kmrml/kcontrol/serverconfigwidget.ui
index e0a08007..c78a5046 100644
--- a/kmrml/kmrml/kcontrol/serverconfigwidget.ui
+++ b/kmrml/kmrml/kcontrol/serverconfigwidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>ServerConfigWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ServerConfigWidget</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout7</cstring>
             </property>
@@ -36,7 +36,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="1">
+                <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
                         <cstring>Layout4</cstring>
                     </property>
@@ -66,7 +66,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>m_addButton</cstring>
                             </property>
@@ -74,7 +74,7 @@
                                 <string>&amp;Add</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>m_removeButton</cstring>
                             </property>
@@ -84,7 +84,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget" row="1" column="1">
+                <widget class="TQLayoutWidget" row="1" column="1">
                     <property name="name">
                         <cstring>Layout6</cstring>
                     </property>
@@ -114,7 +114,7 @@
                                 <string>TCP/IP Port Number of the Indexing Server</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>m_autoPort</cstring>
                             </property>
@@ -135,7 +135,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>200</width>
                                     <height>0</height>
@@ -144,7 +144,7 @@
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>m_hostLabel</cstring>
                     </property>
@@ -155,7 +155,7 @@
                         <cstring>m_hostCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>m_portLabel</cstring>
                     </property>
@@ -168,7 +168,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>m_useAuth</cstring>
             </property>
@@ -176,7 +176,7 @@
                 <string>Per&amp;form authentication</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout12</cstring>
             </property>
@@ -200,14 +200,14 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>16</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout6</cstring>
                     </property>
@@ -221,7 +221,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>m_userLabel</cstring>
                             </property>
@@ -237,7 +237,7 @@
                                 <cstring>m_passEdit</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>m_passLabel</cstring>
                             </property>
@@ -268,5 +268,5 @@
     <tabstop>m_userEdit</tabstop>
     <tabstop>m_passEdit</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>