summaryrefslogtreecommitdiffstats
path: root/tdecore/kgenericfactory.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
commit28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch)
tree7b7a01768b3781763186c825af21bb14717d2c32 /tdecore/kgenericfactory.h
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kgenericfactory.h')
-rw-r--r--tdecore/kgenericfactory.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/kgenericfactory.h b/tdecore/kgenericfactory.h
index 032c14302..426b29ef1 100644
--- a/tdecore/kgenericfactory.h
+++ b/tdecore/kgenericfactory.h
@@ -49,7 +49,7 @@ public:
virtual ~KGenericFactoryBase()
{
if ( s_instance )
- KGlobal::locale()->removeCatalogue( TQString::fromAscii( s_instance->instanceName() ) );
+ TDEGlobal::locale()->removeCatalogue( TQString::fromAscii( s_instance->instanceName() ) );
delete s_instance;
s_instance = 0;
s_self = 0;
@@ -72,7 +72,7 @@ protected:
virtual void setupTranslations( void )
{
if ( instance() )
- KGlobal::locale()->insertCatalogue( TQString::fromAscii( instance()->instanceName() ) );
+ TDEGlobal::locale()->insertCatalogue( TQString::fromAscii( instance()->instanceName() ) );
}
void initializeMessageCatalogue()