diff options
Diffstat (limited to 'kappfinder')
| -rw-r--r-- | kappfinder/common.cpp | 6 | ||||
| -rw-r--r-- | kappfinder/main_install.cpp | 4 | ||||
| -rw-r--r-- | kappfinder/toplevel.cpp | 24 | ||||
| -rw-r--r-- | kappfinder/toplevel.h | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/kappfinder/common.cpp b/kappfinder/common.cpp index 51d30dee5..6a54f1a05 100644 --- a/kappfinder/common.cpp +++ b/kappfinder/common.cpp @@ -20,9 +20,9 @@ */ #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqdir.h> #include <tqfile.h> @@ -50,7 +50,7 @@ void copyFile( const TQString &inFileName, const TQString &outFileName ) bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ, TQString destDir ) { - KDesktopFile desktop( templ, true ); + TDEDesktopFile desktop( templ, true ); // find out where to put the .desktop files TQString destName; diff --git a/kappfinder/main_install.cpp b/kappfinder/main_install.cpp index c56179548..214e596fd 100644 --- a/kappfinder/main_install.cpp +++ b/kappfinder/main_install.cpp @@ -21,9 +21,9 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqstringlist.h> diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp index fd6fd1283..dd4958657 100644 --- a/kappfinder/toplevel.cpp +++ b/kappfinder/toplevel.cpp @@ -23,7 +23,7 @@ #include <tdeapplication.h> #include <kbuttonbox.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdeglobal.h> #include <kiconloader.h> #include <tdelocale.h> @@ -31,7 +31,7 @@ #include <kprogress.h> #include <kservice.h> #include <kservicegroup.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdguiitem.h> #include <tdestartupinfo.h> @@ -77,23 +77,23 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name layout->addWidget( mSummary ); KButtonBox* bbox = new KButtonBox( this ); - mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "edit-find"), TQT_TQOBJECT(this), TQT_SLOT( slotScan() ) ); + mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "edit-find"), this, TQ_SLOT( slotScan() ) ); bbox->addStretch( 5 ); - mSelectButton = bbox->addButton( i18n( "Select All" ), TQT_TQOBJECT(this), - TQT_SLOT( slotSelectAll() ) ); + mSelectButton = bbox->addButton( i18n( "Select All" ), this, + TQ_SLOT( slotSelectAll() ) ); mSelectButton->setEnabled( false ); - mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this), - TQT_SLOT( slotUnselectAll() ) ); + mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), this, + TQ_SLOT( slotUnselectAll() ) ); mUnSelectButton->setEnabled( false ); bbox->addStretch( 5 ); - mApplyButton = bbox->addButton( KStdGuiItem::apply(), TQT_TQOBJECT(this), TQT_SLOT( slotCreate() ) ); + mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQ_SLOT( slotCreate() ) ); mApplyButton->setEnabled( false ); - bbox->addButton( KStdGuiItem::close(), TQT_TQOBJECT(kapp), TQT_SLOT( quit() ) ); + bbox->addButton( KStdGuiItem::close(), tdeApp, TQ_SLOT( quit() ) ); bbox->layout(); layout->addWidget( bbox ); - connect( kapp, TQT_SIGNAL( lastWindowClosed() ), kapp, TQT_SLOT( quit() ) ); + connect( tdeApp, TQ_SIGNAL( lastWindowClosed() ), tdeApp, TQ_SLOT( quit() ) ); mAppCache.setAutoDelete( true ); @@ -105,7 +105,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name TDEStartupInfo::appStarted(); TQAccel *accel = new TQAccel( this ); - accel->connectItem( accel->insertItem( Key_Q + CTRL ), kapp, TQT_SLOT( quit() ) ); + accel->connectItem( accel->insertItem( Key_Q + CTRL ), tdeApp, TQ_SLOT( quit() ) ); TDEAcceleratorManager::manage( this ); } @@ -202,7 +202,7 @@ void TopLevel::slotScan() if (found) continue; - KDesktopFile desktop( *it, true ); + TDEDesktopFile desktop( *it, true ); // copy over the desktop file, if exists if ( scanDesktopFile( mAppCache, *it, mDestDir ) ) { diff --git a/kappfinder/toplevel.h b/kappfinder/toplevel.h index 69e83eb5a..9e3dd2422 100644 --- a/kappfinder/toplevel.h +++ b/kappfinder/toplevel.h @@ -35,7 +35,7 @@ class TQPushButton; class TopLevel : public KDialog { - Q_OBJECT + TQ_OBJECT public: TopLevel( const TQString &destDir, TQWidget *parent = 0, const char *name = 0 ); |