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/sidebar/metabar/src | |
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/sidebar/metabar/src')
-rw-r--r-- | konq-plugins/sidebar/metabar/src/metabar.cpp | 2 | ||||
-rw-r--r-- | konq-plugins/sidebar/metabar/src/serviceloader.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp index 9839fd0..08e38a0 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.cpp +++ b/konq-plugins/sidebar/metabar/src/metabar.cpp @@ -11,7 +11,7 @@ Metabar::Metabar(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQSt KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { KImageIO::registerFormats(); - KGlobal::locale()->insertCatalogue( "konqsidebar_metabar" ); + TDEGlobal::locale()->insertCatalogue( "konqsidebar_metabar" ); widget = new MetabarWidget(widgetParent, "metabarwidget"); } diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index 5e5650d..fd8c02b 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -57,7 +57,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int urlList.clear(); urlList.append(url); - TQStringList dirs = KGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" ); + TQStringList dirs = TDEGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" ); KConfig config("metabarrc", true, false); config.setGroup("General"); int maxActions = config.readNumEntry("MaxActions"); |