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

6 files changed, 19 insertions, 18 deletions

diff --git a/languages/cpp/app_templates/opietoday/app.pro b/languages/cpp/app_templates/opietoday/app.pro
index 152dc6f6..73e03efb 100644
--- a/languages/cpp/app_templates/opietoday/app.pro
+++ b/languages/cpp/app_templates/opietoday/app.pro
@@ -6,8 +6,8 @@ TARGET		= %{APPNAMELC}
 
 
 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/opietoday/exampleplugin.cpp b/languages/cpp/app_templates/opietoday/exampleplugin.cpp
index c7df8069..d3dc37ab 100644
--- a/languages/cpp/app_templates/opietoday/exampleplugin.cpp
+++ b/languages/cpp/app_templates/opietoday/exampleplugin.cpp
@@ -19,7 +19,7 @@ double %{APPNAME}::versionNumber() const {
 
 // this sets the image that will be shown on the left side of the plugin
 TQString %{APPNAME}::pixmapNameWidget() const {
-    return TQString::fromLatin1("%{APPNAMELC}/%{APPNAMELC}");
+    return TQString::tqfromLatin1("%{APPNAMELC}/%{APPNAMELC}");
 }
 
 TQWidget* %{APPNAME}::widget( TQWidget * wid ) {
@@ -36,13 +36,13 @@ TQString %{APPNAME}::pixmapNameConfig() const {
 }
 
 // No config widget yet, look at the datebook plugin for an example of that
-TodayConfigWidget* %{APPNAME}::configWidget( TQWidget* /*parent*/ ) {
+TodayConfigWidget* %{APPNAME}::configWidget( TQWidget* /*tqparent*/ ) {
     return 0l;
 }
 
 // add the binary name of the app to launch here
 TQString %{APPNAME}::appName() const {
-    return TQString::null;
+    return TQString();
 }
 
 // if the plugin should be excluded form the refresh cycles that can be set in the today app
diff --git a/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp b/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp
index 3a9481f1..a4896308 100644
--- a/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp
+++ b/languages/cpp/app_templates/opietoday/examplepluginimpl.cpp
@@ -14,17 +14,17 @@ TodayPluginObject* %{APPNAME}Impl::guiPart() {
     return examplePlugin;
 }
 
-QRESULT %{APPNAME}Impl::queryInterface( const QUuid & uuid,  QUnknownInterface **iface ) {
+TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid & uuid,  TQUnknownInterface **iface ) {
     *iface = 0;
-    if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) )  {
+    if ( ( uuid == IID_TQUnknown ) || ( uuid == IID_TodayPluginInterface ) )  {
         *iface = this, (*iface)->addRef();
     }else
-	return QS_FALSE;
+	return TQS_FALSE;
 
-    return QS_OK;
+    return TQS_OK;
 
 }
 
-Q_EXPORT_INTERFACE() {
-    Q_CREATE_INSTANCE( %{APPNAME}Impl );
+TQ_EXPORT_INTERFACE() {
+    TQ_CREATE_INSTANCE( %{APPNAME}Impl );
 }
diff --git a/languages/cpp/app_templates/opietoday/examplepluginimpl.h b/languages/cpp/app_templates/opietoday/examplepluginimpl.h
index ccb7c3b3..ddc63bc2 100644
--- a/languages/cpp/app_templates/opietoday/examplepluginimpl.h
+++ b/languages/cpp/app_templates/opietoday/examplepluginimpl.h
@@ -11,8 +11,8 @@ public:
     %{APPNAME}Impl();
     virtual ~%{APPNAME}Impl();
 
-    QRESULT queryInterface( const QUuid &,  QUnknownInterface** );
-    Q_REFCOUNT
+    TQRESULT queryInterface( const TQUuid &,  TQUnknownInterface** );
+    TQ_REFCOUNT
 
     virtual TodayPluginObject *guiPart();
 
diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp
index a80dad81..98b19f9a 100644
--- a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp
+++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp
@@ -1,10 +1,10 @@
-#include <qpe/config.h>
-#include <qpe/qcopenvelope_qws.h>
+#include <tqpe/config.h>
+#include <tqpe/tqcopenvelope_qws.h>
 
 #include "%{APPNAMELC}widget.h"
 
-%{APPNAME}Widget::%{APPNAME}Widget( TQWidget *parent,  const char* name)
-    : TQWidget(parent,  name ) {
+%{APPNAME}Widget::%{APPNAME}Widget( TQWidget *tqparent,  const char* name)
+    : TQWidget(tqparent,  name ) {
 
     m_exampleLabel = 0l;
     m_layout = 0l;
diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.h b/languages/cpp/app_templates/opietoday/examplepluginwidget.h
index 53a67b18..f5e35d4e 100644
--- a/languages/cpp/app_templates/opietoday/examplepluginwidget.h
+++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.h
@@ -8,9 +8,10 @@
 class %{APPNAME}Widget : public TQWidget {
 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    %{APPNAME}Widget( TQWidget *parent,  const char *name );
+    %{APPNAME}Widget( TQWidget *tqparent,  const char *name );
     ~%{APPNAME}Widget();
     
     void refresh();