TQt4 port kdewebdev

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 9 deletions

diff --git a/kommander/widgets/dialog.cpp b/kommander/widgets/dialog.cpp
index fd3b0b27..15dd7e30 100644
--- a/kommander/widgets/dialog.cpp
+++ b/kommander/widgets/dialog.cpp
@@ -34,14 +34,14 @@
 
 enum Functions {
   FirstFunction = 185,
-  D_focusWidget,
+  D_tqfocusWidget,
   D_waitCursor,
   D_restoreCursor,
   LastFunction
 };
 
 Dialog::Dialog(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags)
-  : TQDialog(a_parent, a_name, a_modal, a_flags), KommanderWindow(this)
+  : TQDialog(a_parent, a_name, a_modal, a_flags), KommanderWindow(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -53,7 +53,7 @@ Dialog::Dialog(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags
   m_shebang = "#!/usr/bin/kmdr-executor";
   m_firstShow = true;
   KommanderPlugin::setDefaultGroup(Group::DCOP);
-  KommanderPlugin::registerFunction(D_focusWidget, "focusWidget(TQString widget)",  i18n("The name of the widget having focus"), 1);
+  KommanderPlugin::registerFunction(D_tqfocusWidget, "tqfocusWidget(TQString widget)",  i18n("The name of the widget having focus"), 1);
   KommanderPlugin::registerFunction(D_waitCursor, "waitCursor(TQString widget)",  i18n("Set a wait cursor. CAUTION: if set more than once an equal number of calls to restore must be made to clear it."), 1);
   KommanderPlugin::registerFunction(D_restoreCursor, "restoreCursor(TQString widget)",  i18n("Restore normal curser. NOTE: must be called as many times as wait was."), 1);
 }
@@ -148,7 +148,7 @@ void Dialog::show()
 {
 //if the dialog is embedded in a KPart, the show can be called many times.
 //to avoid re-init and sending signals we don't want, in that case call only the
-//QWidget's show method to show the widgets, but don't do any TQDialog specific 
+//TQWidget's show method to show the widgets, but don't do any TQDialog specific 
 //task
   if (!m_firstShow) 
   {
@@ -193,7 +193,7 @@ void Dialog::contextMenuEvent( TQContextMenuEvent * e )
 
 bool Dialog::isFunctionSupported(int f)
 {
-  return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry || (f > FirstFunction && f < LastFunction);
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::tqgeometry || (f > FirstFunction && f < LastFunction);
 }
 
 TQString Dialog::handleDCOP(int function, const TQStringList& args)
@@ -204,14 +204,14 @@ TQString Dialog::handleDCOP(int function, const TQStringList& args)
     case DCOP::setText:
       setWidgetText(args[0]);
       break;
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
       return TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       break;
-    case D_focusWidget:
-      return focusWidget()->name();
+    case D_tqfocusWidget:
+      return tqfocusWidget()->name();
       break;
     case D_waitCursor:
-      TQApplication::setOverrideCursor(TQCursor(Qt::WaitCursor));
+      TQApplication::setOverrideCursor(TQCursor(TQt::WaitCursor));
       break;
     case D_restoreCursor:
       TQApplication::restoreOverrideCursor();