summaryrefslogtreecommitdiffstats
path: root/kresources/scalix/shared/resourcescalixbase.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /kresources/scalix/shared/resourcescalixbase.cpp
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kresources/scalix/shared/resourcescalixbase.cpp')
-rw-r--r--kresources/scalix/shared/resourcescalixbase.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp
index c9c7ee11d..de1aa9159 100644
--- a/kresources/scalix/shared/resourcescalixbase.cpp
+++ b/kresources/scalix/shared/resourcescalixbase.cpp
@@ -51,8 +51,8 @@ static unsigned int uniquifier = 0;
ResourceScalixBase::ResourceScalixBase( const TQCString& objId )
: mSilent( false )
{
- KGlobal::locale()->insertCatalogue( "kres_scalix" );
- KGlobal::locale()->insertCatalogue( "libkcal" );
+ TDEGlobal::locale()->insertCatalogue( "kres_scalix" );
+ TDEGlobal::locale()->insertCatalogue( "libkcal" );
TQString uniqueObjId = TQString( objId ) + TQString::number( uniquifier++ );
mConnection = new KMailConnection( this, uniqueObjId.utf8() );
}