diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:46 -0600 |
| commit | 27430f06c6cc2187c639f59f342f07f1fde91a8b (patch) | |
| tree | 493c1095950b7f0a82690cedac1b749666be1b47 /arts/tools | |
| parent | 794a886cbd6d6893d62026f3800b95051652fc5a (diff) | |
| download | tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'arts/tools')
| -rw-r--r-- | arts/tools/artsactions.cpp | 2 | ||||
| -rw-r--r-- | arts/tools/artscontrolapplet.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp index c483beb0..2a85fc45 100644 --- a/arts/tools/artsactions.cpp +++ b/arts/tools/artsactions.cpp @@ -47,7 +47,7 @@ ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* , _sv( 0 ), _am( 0 ), _asv( 0 ), _mmv( 0 ), _ev( 0 ), _mtv( 0 ) { //kdDebug()<<k_funcinfo<<endl; - KGlobal::locale()->insertCatalogue( "artscontrol" ); + TDEGlobal::locale()->insertCatalogue( "artscontrol" ); if ( !_kartsserver ) _kartsserver = new KArtsServer( this ); } diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp index e086749a..dc495322 100644 --- a/arts/tools/artscontrolapplet.cpp +++ b/arts/tools/artscontrolapplet.cpp @@ -31,7 +31,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) { - KGlobal::locale()->insertCatalogue("artscontrol"); + TDEGlobal::locale()->insertCatalogue("artscontrol"); return new ArtsControlApplet(configFile, KPanelApplet::Normal, KPanelApplet::About /*| KPanelApplet::Help | KPanelApplet::Preferences*/, parent, "artscontrolapplet"); |