Rename old tq methods that no longer need a unique name

5 files changed, 15 insertions, 15 deletions

diff --git a/kommander/widgets/dialog.cpp b/kommander/widgets/dialog.cpp
index 15dd7e30..f7a3fb9b 100644
--- a/kommander/widgets/dialog.cpp
+++ b/kommander/widgets/dialog.cpp
@@ -34,7 +34,7 @@
 
 enum Functions {
   FirstFunction = 185,
-  D_tqfocusWidget,
+  D_focusWidget,
   D_waitCursor,
   D_restoreCursor,
   LastFunction
@@ -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_tqfocusWidget, "tqfocusWidget(TQString widget)",  i18n("The name of the widget having focus"), 1);
+  KommanderPlugin::registerFunction(D_focusWidget, "focusWidget(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);
 }
@@ -207,8 +207,8 @@ TQString Dialog::handleDCOP(int function, const TQStringList& args)
     case DCOP::tqgeometry:
       return TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       break;
-    case D_tqfocusWidget:
-      return tqfocusWidget()->name();
+    case D_focusWidget:
+      return focusWidget()->name();
       break;
     case D_waitCursor:
       TQApplication::setOverrideCursor(TQCursor(TQt::WaitCursor));
diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp
index 549b9678..a5d9a716 100644
--- a/kommander/widgets/execbutton.cpp
+++ b/kommander/widgets/execbutton.cpp
@@ -113,7 +113,7 @@ void ExecButton::setWidgetText(const TQString& a_text)
 void ExecButton::startProcess()
 {
   TQString at = evalAssociatedText().stripWhiteSpace();
-  bool enabledtqStatus = isEnabled();
+  bool enabledStatus = isEnabled();
   if (m_blockGUI != None)
     setEnabled(false);
   if (m_blockGUI == GUI)
@@ -128,7 +128,7 @@ void ExecButton::startProcess()
     if (writeStdout())
       cout << m_output << flush;
   }
-  setEnabled(enabledtqStatus);
+  setEnabled(enabledStatus);
 }
 
 
@@ -202,7 +202,7 @@ TQString ExecButton::handleDCOP(int function, const TQStringList& args)
       break;
     case EB_setPopup:
     {
-      TQWidgetList  *list = TQApplication::tqallWidgets();
+      TQWidgetList  *list = TQApplication::allWidgets();
       TQWidgetListIt it( *list );
       TQWidget * w;
       while ( (w=it.current()) != 0 ) {  // for each widget...
diff --git a/kommander/widgets/fileselector.cpp b/kommander/widgets/fileselector.cpp
index 51afa92a..897f85c8 100644
--- a/kommander/widgets/fileselector.cpp
+++ b/kommander/widgets/fileselector.cpp
@@ -50,9 +50,9 @@ FileSelector::FileSelector(TQWidget * a_parent, const char *a_name)
   m_boxLayout->addWidget(m_lineEdit);
   m_boxLayout->addWidget(m_selectButton);
 
-  tqsetSizePolicy(m_lineEdit->sizePolicy());
-  m_lineEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
-  m_selectButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+  setSizePolicy(m_lineEdit->sizePolicy());
+  m_lineEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+  m_selectButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 
   connect(m_selectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(makeSelection()));
 
diff --git a/kommander/widgets/progressbar.cpp b/kommander/widgets/progressbar.cpp
index f78ce62c..19e89903 100644
--- a/kommander/widgets/progressbar.cpp
+++ b/kommander/widgets/progressbar.cpp
@@ -123,7 +123,7 @@ TQString ProgressBar::handleDCOP(int function, const TQStringList& args)
       color.setNamedColor(args[0]);
       TQPalette p = this->palette();
       p.setColor(TQPalette::Active, TQColorGroup::Highlight, color);
-      this->tqsetPalette( p, TRUE );
+      this->setPalette( p, TRUE );
       break;
     }
     case PB_setHightlightTextColor:
@@ -132,7 +132,7 @@ TQString ProgressBar::handleDCOP(int function, const TQStringList& args)
       color.setNamedColor(args[0]);
       TQPalette p = this->palette();
       p.setColor(TQPalette::Active, TQColorGroup::HighlightedText, color);
-      this->tqsetPalette( p, TRUE );
+      this->setPalette( p, TRUE );
       break;
     }
     default:
diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp
index 5c6c530c..0aebf718 100644
--- a/kommander/widgets/richtexteditor.cpp
+++ b/kommander/widgets/richtexteditor.cpp
@@ -182,11 +182,11 @@ void RichTextEditor::textAlign(int a_id)
 {
   TQToolButton *b = (TQToolButton *)m_alignGroup->find(a_id);
   if(b == m_buttonTextLeft)
-    m_textedit->tqsetAlignment(TQt::AlignLeft);
+    m_textedit->setAlignment(TQt::AlignLeft);
   else if(b == m_buttonTextCenter)
-    m_textedit->tqsetAlignment(TQt::AlignCenter);
+    m_textedit->setAlignment(TQt::AlignCenter);
   else if(b == m_buttonTextRight)
-    m_textedit->tqsetAlignment(TQt::AlignRight);
+    m_textedit->setAlignment(TQt::AlignRight);
 }
 
 void RichTextEditor::fontChanged(const TQFont &a_font)