From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 14 Jun 2011 16:45:05 +0000 Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- languages/cpp/app_templates/opienet/app.pro | 4 ++-- languages/cpp/app_templates/opienet/simmplemodule.h | 8 ++++---- languages/cpp/app_templates/opienet/simpleiface.cpp | 8 ++++---- languages/cpp/app_templates/opienet/simpleiface.h | 3 ++- languages/cpp/app_templates/opienet/simplemodule.cpp | 4 ++-- languages/cpp/app_templates/opienet/simplemodule.h | 8 ++++---- 6 files changed, 18 insertions(+), 17 deletions(-) (limited to 'languages/cpp/app_templates/opienet') diff --git a/languages/cpp/app_templates/opienet/app.pro b/languages/cpp/app_templates/opienet/app.pro index 53fb6eea..df87650c 100644 --- a/languages/cpp/app_templates/opienet/app.pro +++ b/languages/cpp/app_templates/opienet/app.pro @@ -7,8 +7,8 @@ LIBS += -linterfaces QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -contains( TEMPLATE, quick-template ){ - contains( QUICK_SPEC_FOO, quick-app-lib ){ +tqcontains( TEMPLATE, quick-template ){ + tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opienet/simmplemodule.h b/languages/cpp/app_templates/opienet/simmplemodule.h index 7a8882b4..5c928ec9 100644 --- a/languages/cpp/app_templates/opienet/simmplemodule.h +++ b/languages/cpp/app_templates/opienet/simmplemodule.h @@ -12,19 +12,19 @@ public: VirtualModule(); ~VirtualModule(); - const TQString type() {return TQString::fromLatin1("vpn" );} + const TQString type() {return TQString::tqfromLatin1("vpn" );} void setProfile( const TQString& ) {} bool isOwner( Interface* ); TQWidget *configure( Interface* ); TQWidget *information( Interface* ); - QList getInterfaces(); + TQList getInterfaces(); void possibleNewInterfaces( TQMap& ); Interface *addNewInterface( const TQString& ); bool remove( Interface* iface ); - TQString getPixmapName( Interface* ) {return TQString::fromLatin1("Tux"); } + TQString getPixmapName( Interface* ) {return TQString::tqfromLatin1("Tux"); } void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen private: - QList m_interfaces; + TQList m_interfaces; }; extern "C" { diff --git a/languages/cpp/app_templates/opienet/simpleiface.cpp b/languages/cpp/app_templates/opienet/simpleiface.cpp index bbabcbda..9b38bc77 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.cpp +++ b/languages/cpp/app_templates/opienet/simpleiface.cpp @@ -1,9 +1,9 @@ #include "%{APPNAMELC}iface.h" -%{APPNAME}Interface::%{APPNAME}Interface( TQObject* parent, +%{APPNAME}Interface::%{APPNAME}Interface( TQObject* tqparent, const char* name, bool status ) - : Interface(parent, name, status ) + : Interface(tqparent, name, status ) { } @@ -31,13 +31,13 @@ bool %{APPNAME}Interface::refresh() { void %{APPNAME}Interface::start() { // call pptp - setStatus(true); + settqStatus(true); refresh(); emit updateMessage("VPN started"); } void %{APPNAME}Interface::stop() { - setStatus(false ); + settqStatus(false ); refresh(); emit updateMessage("VPN halted"); } diff --git a/languages/cpp/app_templates/opienet/simpleiface.h b/languages/cpp/app_templates/opienet/simpleiface.h index ef514697..c38d884f 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.h +++ b/languages/cpp/app_templates/opienet/simpleiface.h @@ -5,9 +5,10 @@ class %{APPNAME}Interface : public Interface { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Interface(TQObject* parent, const char* name = "vpn", bool up = false ); + %{APPNAME}Interface(TQObject* tqparent, const char* name = "vpn", bool up = false ); ~%{APPNAME}Interface(); public slots: diff --git a/languages/cpp/app_templates/opienet/simplemodule.cpp b/languages/cpp/app_templates/opienet/simplemodule.cpp index 0a96c844..f8e963bd 100644 --- a/languages/cpp/app_templates/opienet/simplemodule.cpp +++ b/languages/cpp/app_templates/opienet/simplemodule.cpp @@ -29,7 +29,7 @@ */ bool %{APPNAME}Module::isOwner( Interface* iface ) { /* check if it is our device */ - return m_interfaces.find( iface ) != -1; + return m_interfaces.tqfind( iface ) != -1; } TQWidget* %{APPNAME}Module::configure( Interface* ) { @@ -41,7 +41,7 @@ TQWidget* %{APPNAME}Module::information( Interface* iface ) { return new InterfaceInformationImp(0, "Interface info", iface ); } -QList %{APPNAME}Module::getInterfaces() { +TQList %{APPNAME}Module::getInterfaces() { return m_interfaces; } diff --git a/languages/cpp/app_templates/opienet/simplemodule.h b/languages/cpp/app_templates/opienet/simplemodule.h index 4120d811..327c1d43 100644 --- a/languages/cpp/app_templates/opienet/simplemodule.h +++ b/languages/cpp/app_templates/opienet/simplemodule.h @@ -12,19 +12,19 @@ public: %{APPNAME}Module(); ~%{APPNAME}Module(); - const TQString type() {return TQString::fromLatin1("vpn" );} + const TQString type() {return TQString::tqfromLatin1("vpn" );} void setProfile( const TQString& ) {} bool isOwner( Interface* ); TQWidget *configure( Interface* ); TQWidget *information( Interface* ); - QList getInterfaces(); + TQList getInterfaces(); void possibleNewInterfaces( TQMap& ); Interface *addNewInterface( const TQString& ); bool remove( Interface* iface ); - TQString getPixmapName( Interface* ) {return TQString::fromLatin1("Tux"); } + TQString getPixmapName( Interface* ) {return TQString::tqfromLatin1("Tux"); } void receive( const TQCString&, const TQByteArray& ar ) {} // don't listen private: - QList m_interfaces; + TQList m_interfaces; }; extern "C" { -- cgit v1.2.1