diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:29 -0600 |
| commit | 2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (patch) | |
| tree | 36de2281c8b4cf238a5e27a76b5c6e07f40151ab /libk3b/plugin | |
| parent | 2a3289ab87c52551fd2f5655492988ca02c17892 (diff) | |
| download | k3b-2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5.tar.gz k3b-2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libk3b/plugin')
| -rw-r--r-- | libk3b/plugin/k3bpluginfactory.h | 4 | ||||
| -rw-r--r-- | libk3b/plugin/k3bpluginmanager.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libk3b/plugin/k3bpluginfactory.h b/libk3b/plugin/k3bpluginfactory.h index 6e4da16..ab415fa 100644 --- a/libk3b/plugin/k3bpluginfactory.h +++ b/libk3b/plugin/k3bpluginfactory.h @@ -43,7 +43,7 @@ class K3bPluginFactory : public KLibFactory ~K3bPluginFactory() { if ( s_instance ) - KGlobal::locale()->removeCatalogue( s_instance->instanceName() ); + TDEGlobal::locale()->removeCatalogue( s_instance->instanceName() ); delete s_instance; s_instance = 0; s_self = 0; @@ -54,7 +54,7 @@ class K3bPluginFactory : public KLibFactory protected: virtual void setupTranslations( void ) { if( instance() ) - KGlobal::locale()->insertCatalogue( instance()->instanceName() ); + TDEGlobal::locale()->insertCatalogue( instance()->instanceName() ); } void initializeMessageCatalogue() { diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginmanager.cpp index bf6d914..2e3724d 100644 --- a/libk3b/plugin/k3bpluginmanager.cpp +++ b/libk3b/plugin/k3bpluginmanager.cpp @@ -145,7 +145,7 @@ void K3bPluginManager::loadPlugin( const TQString& fileName ) void K3bPluginManager::loadAll() { // we simply search the K3b plugin dir for now - TQStringList dirs = KGlobal::dirs()->findDirs( "data", "k3b/plugins/" ); + TQStringList dirs = TDEGlobal::dirs()->findDirs( "data", "k3b/plugins/" ); for( TQStringList::const_iterator it = dirs.begin(); it != dirs.end(); ++it ) { |