summaryrefslogtreecommitdiffstats
path: root/konq-plugins/kuick/kdirmenu.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:40:51 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:40:51 -0600
commit4c097708c4cc24f3b8e4c21f14644f5715767d47 (patch)
treee8ca4b1d3a3b3de0d18e5f144dcef9b36f830b84 /konq-plugins/kuick/kdirmenu.cpp
parent0642ee50634d90e255c6f45194f6a47dc1157cde (diff)
downloadtdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.tar.gz
tdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/kuick/kdirmenu.cpp')
-rw-r--r--konq-plugins/kuick/kdirmenu.cpp6
1 files changed, 3 insertions, 3 deletions
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();