diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:51 -0600 |
| commit | 4c097708c4cc24f3b8e4c21f14644f5715767d47 (patch) | |
| tree | e8ca4b1d3a3b3de0d18e5f144dcef9b36f830b84 /konq-plugins/kuick | |
| parent | 0642ee50634d90e255c6f45194f6a47dc1157cde (diff) | |
| download | tdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.tar.gz tdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/kuick')
| -rw-r--r-- | konq-plugins/kuick/kcmkuick/kcmkuick.cpp | 2 | ||||
| -rw-r--r-- | konq-plugins/kuick/kdirmenu.cpp | 6 | ||||
| -rw-r--r-- | konq-plugins/kuick/kuick_plugin.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp index 95abf73..d8015ce 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp @@ -108,7 +108,7 @@ void KCMKuick::save() config.sync(); //is it necessary ? if ( dialog->m_chkShow->isChecked() ) { - TQString servicespath = KGlobal::dirs()->saveLocation( "services"); + TQString servicespath = TDEGlobal::dirs()->saveLocation( "services"); TQFile::remove(servicespath+"/kuick_plugin.desktop"); } else { diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 030ac98..76dbd95 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -71,7 +71,7 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) { if ( iconPath.startsWith("./") ) iconPath = _path + '/' + iconPath.mid(2); TQPixmap icon; - icon = KGlobal::iconLoader()->loadIcon(iconPath, + icon = TDEGlobal::iconLoader()->loadIcon(iconPath, KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, 0, true); if(icon.isNull()) @@ -120,8 +120,8 @@ void KDirMenu::slotAboutToShow( ) { return; } - static const TQString& dot = KGlobal::staticQString( "." ); - static const TQString& dotdot = KGlobal::staticQString( ".." ); + static const TQString& dot = TDEGlobal::staticQString( "." ); + static const TQString& dotdot = TDEGlobal::staticQString( ".." ); for ( TQFileInfoListIterator it( *dirList ); *it; ++it ) { TQString fileName = (*it)->fileName(); diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp index 772f169..1b45791 100644 --- a/konq-plugins/kuick/kuick_plugin.cpp +++ b/konq-plugins/kuick/kuick_plugin.cpp @@ -75,7 +75,7 @@ void KTestMenu::slotFileTransfer( const TQString &uid ) { void KTestMenu::slotPrepareMenu( ) { // now it's time to set up the menu... // search for the dummy entry 'kuick_plugin' stores it index reomev it plug copy at the position - KGlobal::locale()->insertCatalogue("kuick_plugin"); + TDEGlobal::locale()->insertCatalogue("kuick_plugin"); bool isKDesktop = TQCString( kapp->name() ) == "kdesktop"; |