From 27430f06c6cc2187c639f59f342f07f1fde91a8b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:46 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- arts/gui/kde/kvolumefader_impl.cpp | 4 ++-- arts/modules/common/env_mixeritem_impl.cc | 4 ++-- arts/modules/effects/fivebandmonocomplexeq_impl.cc | 2 +- arts/modules/effects/freeverbguifactory_impl.cc | 2 +- arts/modules/effects/monostereoconversion_impl.cc | 2 +- arts/modules/effects/stereocompressorguifactory_impl.cc | 2 +- arts/modules/effects/synth_stereo_fir_equalizer_impl.cc | 2 +- arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc | 2 +- arts/modules/mixers/simplemixerchannelguifactory_impl.cc | 2 +- arts/tools/artsactions.cpp | 2 +- arts/tools/artscontrolapplet.cpp | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) (limited to 'arts') diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp index 97ea35a6..11a94ae0 100644 --- a/arts/gui/kde/kvolumefader_impl.cpp +++ b/arts/gui/kde/kvolumefader_impl.cpp @@ -184,8 +184,8 @@ void KVolumeFader_Widget::mousePressEvent( TQMouseEvent* ){ void KVolumeFader_Widget::mouseReleaseEvent( TQMouseEvent* qme ){ bool setValue = false; - if ( KGlobalSettings::mouseSettings().handed == 0 && qme->button() == Qt::LeftButton ) setValue=true; - if ( KGlobalSettings::mouseSettings().handed == 1 && qme->button() == Qt::RightButton ) setValue=true; + if ( TDEGlobalSettings::mouseSettings().handed == 0 && qme->button() == Qt::LeftButton ) setValue=true; + if ( TDEGlobalSettings::mouseSettings().handed == 1 && qme->button() == Qt::RightButton ) setValue=true; if ( setValue ) { switch ( _dir ) { diff --git a/arts/modules/common/env_mixeritem_impl.cc b/arts/modules/common/env_mixeritem_impl.cc index 0f4db5e8..6f4e0e48 100644 --- a/arts/modules/common/env_mixeritem_impl.cc +++ b/arts/modules/common/env_mixeritem_impl.cc @@ -272,7 +272,7 @@ public: } Widget initialize(MixerItem item) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); VBox vbox; vbox._addChild(self(),"the_gui_updating_widget"); @@ -301,7 +301,7 @@ class MixerGuiFactory_impl : virtual public MixerGuiFactory_skel public: Widget createGui(Object object) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); std::string iface = object._interfaceName(); diff --git a/arts/modules/effects/fivebandmonocomplexeq_impl.cc b/arts/modules/effects/fivebandmonocomplexeq_impl.cc index 56ca6037..148f1a0d 100644 --- a/arts/modules/effects/fivebandmonocomplexeq_impl.cc +++ b/arts/modules/effects/fivebandmonocomplexeq_impl.cc @@ -102,7 +102,7 @@ class FiveBandMonoComplexEQGuiFactory_impl : virtual public FiveBandMonoComplexE public: Arts::Widget createGui( Arts::Object object ) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail( !object.isNull(), Arts::Widget::null() ); FiveBandMonoComplexEQ ch = DynamicCast( object ); diff --git a/arts/modules/effects/freeverbguifactory_impl.cc b/arts/modules/effects/freeverbguifactory_impl.cc index 7af1f471..c15a5bfd 100644 --- a/arts/modules/effects/freeverbguifactory_impl.cc +++ b/arts/modules/effects/freeverbguifactory_impl.cc @@ -44,7 +44,7 @@ REGISTER_IMPLEMENTATION(FreeverbGuiFactory_impl); Widget FreeverbGuiFactory_impl::createGui(Object object) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); Synth_FREEVERB freeverb = DynamicCast(object); diff --git a/arts/modules/effects/monostereoconversion_impl.cc b/arts/modules/effects/monostereoconversion_impl.cc index 49643eed..deee99fd 100644 --- a/arts/modules/effects/monostereoconversion_impl.cc +++ b/arts/modules/effects/monostereoconversion_impl.cc @@ -139,7 +139,7 @@ class StereoBalanceGuiFactory_impl : virtual public StereoBalanceGuiFactory_skel public: Widget createGui( Object object ) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail( !object.isNull(), Arts::Widget::null() ); StereoBalance ch= DynamicCast( object ); diff --git a/arts/modules/effects/stereocompressorguifactory_impl.cc b/arts/modules/effects/stereocompressorguifactory_impl.cc index e5a985fc..3c05ab9f 100644 --- a/arts/modules/effects/stereocompressorguifactory_impl.cc +++ b/arts/modules/effects/stereocompressorguifactory_impl.cc @@ -33,7 +33,7 @@ class StereoCompressorGuiFactory_impl : virtual public StereoCompressorGuiFactor public: Widget createGui( Object object ) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null() ); diff --git a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc index ece106c2..364375c2 100644 --- a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc +++ b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc @@ -176,7 +176,7 @@ REGISTER_IMPLEMENTATION(StereoFirEqualizerGuiFactory_impl); Widget StereoFirEqualizerGuiFactory_impl::createGui(Object object) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); Synth_STEREO_FIR_EQUALIZER equalizer = DynamicCast(object); diff --git a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc index d97f1aa4..64b48ad7 100644 --- a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc +++ b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc @@ -12,7 +12,7 @@ namespace Arts { public: Widget createGui(Object object) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); MonoSimpleMixerChannel ch= DynamicCast(object); arts_return_val_if_fail(!ch.isNull(), Arts::Widget::null()); diff --git a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc b/arts/modules/mixers/simplemixerchannelguifactory_impl.cc index 0f585eb1..370865bf 100644 --- a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc +++ b/arts/modules/mixers/simplemixerchannelguifactory_impl.cc @@ -10,7 +10,7 @@ namespace Arts { public: Widget createGui(Object object) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); SimpleMixerChannel ch = DynamicCast(object); arts_return_val_if_fail(!ch.isNull(), Arts::Widget::null()); 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()<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"); -- cgit v1.2.1