Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


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

2 files changed, 16 insertions, 16 deletions

diff --git a/kappfinder/common.cpp b/kappfinder/common.cpp
index 71ae2319e..c5cea0df5 100644
--- a/kappfinder/common.cpp
+++ b/kappfinder/common.cpp
@@ -61,13 +61,13 @@ bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ,
 
   // find out the name of the file to store
   destName = templ;
-  int pos = templ.find( "kappfinder/apps/" );
+  int pos = templ.tqfind( "kappfinder/apps/" );
   if ( pos > 0 )
     destName = destName.mid( pos + strlen( "kappfinder/apps/" ) );
 
   // calculate real dir and filename
   destName = destDir + destName;
-  pos = destName.findRev( '/' );
+  pos = destName.tqfindRev( '/' );
   if ( pos > 0 ) {
     destDir = destName.left( pos );
     destName = destName.mid( pos + 1 );
@@ -77,7 +77,7 @@ bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ,
   TQString exec = desktop.readPathEntry( "TryExec" );
   if ( exec.isEmpty() )
     exec = desktop.readPathEntry( "Exec" );
-  pos = exec.find( ' ' );
+  pos = exec.tqfind( ' ' );
   if ( pos > 0 )
     exec = exec.left( pos );
 
@@ -117,7 +117,7 @@ void createDesktopFiles( TQPtrList<AppLnkCache> &appCache, int &added )
       destDir += "/";
       TQDir d;
       int pos = -1;
-      while ( ( pos = destDir.find( '/', pos + 1 ) ) >= 0 ) {
+      while ( ( pos = destDir.tqfind( '/', pos + 1 ) ) >= 0 ) {
         TQString path = destDir.left( pos + 1 );
         d = path;
         if ( !d.exists() )
@@ -144,7 +144,7 @@ void decorateDirs( TQString destDir )
   for ( it = dirs.begin(); it != dirs.end(); ++it ) {
     // find out the name of the file to store
     TQString destName = *it;
-    int pos = destName.find( "kappfinder/apps/" );
+    int pos = destName.tqfind( "kappfinder/apps/" );
     if ( pos > 0 )
       destName = destName.mid( pos + strlen( "kappfinder/apps/" ) );
 
diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp
index 660c5b498..389beacda 100644
--- a/kappfinder/toplevel.cpp
+++ b/kappfinder/toplevel.cpp
@@ -54,7 +54,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
                                     "applications on your system and adds "
                                     "them to the KDE menu system. "
                                     "Click 'Scan' to begin, select the desired applications and then click 'Apply'."), this);
-  label->setAlignment( AlignAuto | WordBreak );
+  label->tqsetAlignment( AlignAuto | WordBreak );
   layout->addWidget( label );
 
   layout->addSpacing( 5 );
@@ -77,18 +77,18 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
   layout->addWidget( mSummary );
 
   KButtonBox* bbox = new KButtonBox( this );
-  mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "find"), this, TQT_SLOT( slotScan() ) );
+  mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "find"), TQT_TQOBJECT(this), TQT_SLOT( slotScan() ) );
   bbox->addStretch( 5 );
-  mSelectButton = bbox->addButton( i18n( "Select All" ), this,
+  mSelectButton = bbox->addButton( i18n( "Select All" ), TQT_TQOBJECT(this),
                                    TQT_SLOT( slotSelectAll() ) );
   mSelectButton->setEnabled( false );
-  mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), this,
+  mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this),
                                      TQT_SLOT( slotUnselectAll() ) );
   mUnSelectButton->setEnabled( false );
   bbox->addStretch( 5 );
-  mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQT_SLOT( slotCreate() ) );
+  mApplyButton = bbox->addButton( KStdGuiItem::apply(), TQT_TQOBJECT(this), TQT_SLOT( slotCreate() ) );
   mApplyButton->setEnabled( false );
-  bbox->addButton( KStdGuiItem::close(), kapp, TQT_SLOT( quit() ) );
+  bbox->addButton( KStdGuiItem::close(), TQT_TQOBJECT(kapp), TQT_SLOT( quit() ) );
   bbox->layout();
 
   layout->addWidget( bbox );
@@ -100,7 +100,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
   adjustSize();
 
   mDestDir = destDir;
-  mDestDir = mDestDir.replace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" );
+  mDestDir = mDestDir.tqreplace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" );
 	
   KStartupInfo::appStarted();
 
@@ -183,9 +183,9 @@ void TopLevel::slotScan()
     mProgress->setProgress( mProgress->progress() + 1 );
 
     TQString desktopName = *it;
-    int i = desktopName.findRev('/');
+    int i = desktopName.tqfindRev('/');
     desktopName = desktopName.mid(i+1);
-    i = desktopName.findRev('.');
+    i = desktopName.tqfindRev('.');
     if (i != -1)
        desktopName = desktopName.left(i);
 
@@ -207,9 +207,9 @@ void TopLevel::slotScan()
     // copy over the desktop file, if exists
     if ( scanDesktopFile( mAppCache, *it, mDestDir ) ) {
       TQString relPath = *it;
-      int pos = relPath.find( "kappfinder/apps/" );
+      int pos = relPath.tqfind( "kappfinder/apps/" );
       relPath = relPath.mid( pos + strlen( "kappfinder/apps/" ) );
-      relPath = relPath.left( relPath.findRev( '/' ) + 1 );
+      relPath = relPath.left( relPath.tqfindRev( '/' ) + 1 );
       TQStringList dirList = TQStringList::split( '/', relPath );
 
       TQListViewItem *dirItem = 0;