diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:45:52 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:45:52 -0600 |
| commit | 6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef (patch) | |
| tree | 44659d1cc0c37eb995e572bc1b979e75a74210fb /kmrml/kmrml/mrml.cpp | |
| parent | e2385b701b464dc2259fcd5f3819c98f2c8c4438 (diff) | |
| download | tdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.tar.gz tdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmrml/kmrml/mrml.cpp')
| -rw-r--r-- | kmrml/kmrml/mrml.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp index ab4cfcfc..5fc30e8c 100644 --- a/kmrml/kmrml/mrml.cpp +++ b/kmrml/kmrml/mrml.cpp @@ -40,7 +40,7 @@ extern "C" { { KLocale::setMainCatalogue("tdelibs"); TDEInstance instance( "kio_mrml" ); - KGlobal::locale()->insertCatalogue( "kmrml" ); + TDEGlobal::locale()->insertCatalogue( "kmrml" ); kdDebug() << "Starting MRML " << getpid() << endl; @@ -62,7 +62,7 @@ const int Mrml::bufsize = 8192; Mrml::Mrml( const TQCString& pool_socket, const TQCString& app_socket ) : TCPSlaveBase( 12789, "mrml", pool_socket, app_socket ), - m_config( KGlobal::config() ) + m_config( TDEGlobal::config() ) { MrmlShared::ref(); } |