From f138d74fe16092003b06f5bde9663841929cde7f Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 17 Jun 2011 22:17:08 +0000 Subject: TQt4 port kdeaccessibility This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaccessibility@1237325 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksayit/Freeverb_plugin/Makefile.am | 2 +- ksayit/Freeverb_plugin/freeverb_setup.ui | 82 ++++++++++++++-------------- ksayit/Freeverb_plugin/freeverbsetupimpl.cpp | 4 +- ksayit/Freeverb_plugin/freeverbsetupimpl.h | 3 +- ksayit/Freeverb_plugin/ksayitfreeverblib.cpp | 10 ++-- ksayit/Freeverb_plugin/ksayitfreeverblib.h | 10 ++-- 6 files changed, 57 insertions(+), 54 deletions(-) (limited to 'ksayit/Freeverb_plugin') diff --git a/ksayit/Freeverb_plugin/Makefile.am b/ksayit/Freeverb_plugin/Makefile.am index 0db4104..d226444 100644 --- a/ksayit/Freeverb_plugin/Makefile.am +++ b/ksayit/Freeverb_plugin/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/ksayit/src $(all_includes) +INCLUDES = -I$(top_srcdir)/ksayit/src $(all_includes) -I$(kde_includes)/kde -I$(kde_includes)/arts METASOURCES = AUTO kde_servicetypes_DATA = ksayit_libFreeverb_service.desktop kde_services_DATA = ksayit_libFreeverb.desktop diff --git a/ksayit/Freeverb_plugin/freeverb_setup.ui b/ksayit/Freeverb_plugin/freeverb_setup.ui index ab3808a..c1dffb0 100644 --- a/ksayit/Freeverb_plugin/freeverb_setup.ui +++ b/ksayit/Freeverb_plugin/freeverb_setup.ui @@ -1,6 +1,6 @@ Freeverb_Setup - + Freeverb_Setup @@ -20,7 +20,7 @@ 0 - + 360 300 @@ -36,15 +36,15 @@ Minimum - + - layout6 + tqlayout6 unnamed - + frame_room @@ -56,7 +56,7 @@ 0 - + 0 260 @@ -72,18 +72,18 @@ unnamed - + textLabel_room <b>Room</b> - + WordBreak|AlignCenter - + LCD_room @@ -121,7 +121,7 @@ Flat - + slider_room @@ -149,7 +149,7 @@ - + frame_damp @@ -161,7 +161,7 @@ 0 - + 0 260 @@ -177,18 +177,18 @@ unnamed - + textLabel_damp <b>Damp</b> - + WordBreak|AlignCenter - + LCD_damp @@ -226,7 +226,7 @@ Flat - + slider_damp @@ -248,7 +248,7 @@ - + frame_wet @@ -260,7 +260,7 @@ 0 - + 0 260 @@ -276,18 +276,18 @@ unnamed - + textLabel_wet <b>Wet</b> - + WordBreak|AlignCenter - + LCD_wet @@ -325,7 +325,7 @@ Flat - + slider_wet @@ -347,7 +347,7 @@ - + frame_dry @@ -359,7 +359,7 @@ 0 - + 0 260 @@ -375,18 +375,18 @@ unnamed - + textLabel_dry <b>Dry</b> - + WordBreak|AlignCenter - + LCD_dry @@ -424,7 +424,7 @@ Flat - + slider_dry @@ -446,7 +446,7 @@ - + frame_width @@ -458,7 +458,7 @@ 0 - + 0 260 @@ -474,18 +474,18 @@ unnamed - + textLabel_width <b>Width</b> - + WordBreak|AlignCenter - + LCD_width @@ -523,7 +523,7 @@ Flat - + slider_width @@ -569,9 +569,9 @@ Horizontal - + - layout12 + tqlayout12 @@ -587,7 +587,7 @@ Expanding - + 180 20 @@ -598,7 +598,7 @@ OK_Button - + 60 0 @@ -653,15 +653,15 @@ slotOKwasClicked() - + sliderRoomChanged(int) sliderDampChanged(int) sliderWetChanged(int) sliderDryChanged(int) sliderWidthChanged(int) slotOKwasClicked() - - + + kpushbutton.h diff --git a/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp b/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp index 4fd00be..f861a57 100644 --- a/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp +++ b/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp @@ -28,8 +28,8 @@ using namespace std; // App specific includes #include "freeverbsetupimpl.h" -FreeverbSetupImpl::FreeverbSetupImpl(TQWidget *parent, const char *name, bool modal, KConfig *config ) - : Freeverb_Setup(parent,name,modal), m_config(config) { +FreeverbSetupImpl::FreeverbSetupImpl(TQWidget *tqparent, const char *name, bool modal, KConfig *config ) + : Freeverb_Setup(tqparent,name,modal), m_config(config) { // initialize Widgets Init(); diff --git a/ksayit/Freeverb_plugin/freeverbsetupimpl.h b/ksayit/Freeverb_plugin/freeverbsetupimpl.h index b243faf..b7c884f 100644 --- a/ksayit/Freeverb_plugin/freeverbsetupimpl.h +++ b/ksayit/Freeverb_plugin/freeverbsetupimpl.h @@ -33,8 +33,9 @@ class FreeverbSetupImpl : public Freeverb_Setup { Q_OBJECT + TQ_OBJECT public: - FreeverbSetupImpl(TQWidget *parent=0, const char *name=0, bool modal=true, KConfig *config=0); + FreeverbSetupImpl(TQWidget *tqparent=0, const char *name=0, bool modal=true, KConfig *config=0); ~FreeverbSetupImpl(); public slots: diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp index bb91885..64febd1 100644 --- a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp +++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp @@ -41,19 +41,19 @@ KInstance *FreeverbPluginFactory::p_instance = 0L; // Factory Constructor -FreeverbPluginFactory::FreeverbPluginFactory(TQObject *parent, const char* name) +FreeverbPluginFactory::FreeverbPluginFactory(TQObject *tqparent, const char* name) { p_instance = new KInstance("FreeverbPluginFactory"); } -TQObject* FreeverbPluginFactory::createObject(TQObject *parent, const char* name, +TQObject* FreeverbPluginFactory::createObject(TQObject *tqparent, const char* name, const char*, const TQStringList &) { kdDebug(100200) << "FreeverbPluginFactory::createObject()" << endl; - TQObject* obj = new FreeverbPlugin( parent, name ); + TQObject* obj = new FreeverbPlugin( tqparent, name ); emit objectCreated( obj ); return obj; } @@ -62,8 +62,8 @@ TQObject* FreeverbPluginFactory::createObject(TQObject *parent, const char* name // Plugin Constructor -FreeverbPlugin::FreeverbPlugin(TQObject *parent, const char* name) //, KApplication *Appl) - : FXPlugin(parent, name) //, m_Appl(Appl) +FreeverbPlugin::FreeverbPlugin(TQObject *tqparent, const char* name) //, KApplication *Appl) + : FXPlugin(tqparent, name) //, m_Appl(Appl) { m_config = new KSimpleConfig("ksayit_freeverbrc"); diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.h b/ksayit/Freeverb_plugin/ksayitfreeverblib.h index e9731d4..aac4408 100644 --- a/ksayit/Freeverb_plugin/ksayitfreeverblib.h +++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.h @@ -27,15 +27,16 @@ class FreeverbPluginFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: // Consturctor - FreeverbPluginFactory(TQObject *parent=0, const char* name=0); + FreeverbPluginFactory(TQObject *tqparent=0, const char* name=0); // Destructor virtual ~FreeverbPluginFactory(){ delete p_instance; }; - TQObject* createObject(TQObject *parent=0, const char* name=0, - const char* className="TQObject", + TQObject* createObject(TQObject *tqparent=0, const char* name=0, + const char* className=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList()); private: @@ -50,9 +51,10 @@ private: class FreeverbPlugin : public FXPlugin { Q_OBJECT + TQ_OBJECT public: // Constructor - FreeverbPlugin(TQObject *parent=0, const char* name=0); //, KApplication *Appl=0); + FreeverbPlugin(TQObject *tqparent=0, const char* name=0); //, KApplication *Appl=0); // Destructor ~FreeverbPlugin(); -- cgit v1.2.1