Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

33 files changed, 37 insertions, 37 deletions

diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp
index 05be2dfe..1ed4888e 100644
--- a/kommander/widgets/aboutdialog.cpp
+++ b/kommander/widgets/aboutdialog.cpp
@@ -42,7 +42,7 @@ enum Functions {
 };
 
 AboutDialog::AboutDialog(TQWidget *parent, const char *name)
- : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this))
+ : TQLabel(parent, name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/buttongroup.cpp b/kommander/widgets/buttongroup.cpp
index 3d17b042..d598d64c 100644
--- a/kommander/widgets/buttongroup.cpp
+++ b/kommander/widgets/buttongroup.cpp
@@ -39,7 +39,7 @@ enum Functions {
 };
 
 ButtonGroup::ButtonGroup(TQWidget *a_parent, const char *a_name)
-	: TQButtonGroup(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+	: TQButtonGroup(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "checked";
diff --git a/kommander/widgets/checkbox.cpp b/kommander/widgets/checkbox.cpp
index 61ab0aff..f7fe20be 100644
--- a/kommander/widgets/checkbox.cpp
+++ b/kommander/widgets/checkbox.cpp
@@ -29,7 +29,7 @@
 #include "checkbox.h"
 
 CheckBox::CheckBox(TQWidget *a_parent, const char *a_name)
-  : TQCheckBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : TQCheckBox(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "unchecked";
diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp
index 30426eb8..0b72f3dc 100644
--- a/kommander/widgets/closebutton.cpp
+++ b/kommander/widgets/closebutton.cpp
@@ -31,7 +31,7 @@
 #include "closebutton.h"
 
 CloseButton::CloseButton(TQWidget* a_parent, const char* a_name)
-  : KPushButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : KPushButton(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
@@ -41,7 +41,7 @@ CloseButton::CloseButton(TQWidget* a_parent, const char* a_name)
 
   connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess()));
 
-  TQObject *parent = TQT_TQOBJECT(this);
+  TQObject *parent = this;
   while (parent->parent() != 0)
   {
     parent = parent->parent();
diff --git a/kommander/widgets/combobox.cpp b/kommander/widgets/combobox.cpp
index 6ebb9c17..e347cdbe 100644
--- a/kommander/widgets/combobox.cpp
+++ b/kommander/widgets/combobox.cpp
@@ -37,7 +37,7 @@ enum Functions {
 
 
 ComboBox::ComboBox(TQWidget *a_parent, const char *a_name)
-  : KComboBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : KComboBox(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/datepicker.cpp b/kommander/widgets/datepicker.cpp
index 72329fd1..6114f7f7 100644
--- a/kommander/widgets/datepicker.cpp
+++ b/kommander/widgets/datepicker.cpp
@@ -27,7 +27,7 @@
 #include "datepicker.h"
 
 DatePicker::DatePicker(TQWidget *a_parent, const char *a_name)
-  : KDatePicker(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : KDatePicker(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/dialog.cpp b/kommander/widgets/dialog.cpp
index 242d4ba4..3c6ed20f 100644
--- a/kommander/widgets/dialog.cpp
+++ b/kommander/widgets/dialog.cpp
@@ -50,7 +50,7 @@ enum Functions {
 };
 
 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(TQT_TQOBJECT(this))
+  : TQDialog(a_parent, a_name, a_modal, a_flags), KommanderWindow(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp
index d4969444..15043c15 100644
--- a/kommander/widgets/execbutton.cpp
+++ b/kommander/widgets/execbutton.cpp
@@ -48,7 +48,7 @@ enum Functions {
 };
 
 ExecButton::ExecButton(TQWidget* a_parent, const char* a_name)
-  : KPushButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : KPushButton(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/fileselector.cpp b/kommander/widgets/fileselector.cpp
index 9d6869a7..9be2fd88 100644
--- a/kommander/widgets/fileselector.cpp
+++ b/kommander/widgets/fileselector.cpp
@@ -35,7 +35,7 @@
 #include "fileselector.h"
 
 FileSelector::FileSelector(TQWidget * a_parent, const char *a_name)
-   : TQWidget(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+   : TQWidget(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp
index 59a1e372..95c4fe82 100644
--- a/kommander/widgets/fontdialog.cpp
+++ b/kommander/widgets/fontdialog.cpp
@@ -34,7 +34,7 @@ enum Functions {
 };
 
 FontDialog::FontDialog(TQWidget *parent, const char *name)
- : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this))
+ : TQLabel(parent, name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/groupbox.cpp b/kommander/widgets/groupbox.cpp
index a90f447e..027168d8 100644
--- a/kommander/widgets/groupbox.cpp
+++ b/kommander/widgets/groupbox.cpp
@@ -32,7 +32,7 @@
 
 
 GroupBox::GroupBox(TQWidget *a_parent, const char *a_name)
-  : TQGroupBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : TQGroupBox(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
@@ -84,13 +84,13 @@ void GroupBox::populate()
 void GroupBox::insertChild(TQObject *a_child)
 {
   m_childList.append(a_child);
-  TQT_TQOBJECT(this)->TQObject::insertChild(a_child);
+  this->TQObject::insertChild(a_child);
 }
  
 void GroupBox::removeChild(TQObject *a_child)
 {
   m_childList.remove(a_child);
-  TQT_TQOBJECT(this)->TQObject::removeChild(a_child);
+  this->TQObject::removeChild(a_child);
 }
 
 void GroupBox::showEvent( TQShowEvent *e )
diff --git a/kommander/widgets/konsole.cpp b/kommander/widgets/konsole.cpp
index bbfc5309..48c49f48 100644
--- a/kommander/widgets/konsole.cpp
+++ b/kommander/widgets/konsole.cpp
@@ -26,7 +26,7 @@
 #include <myprocess.h>
 
 Konsole::Konsole(TQWidget* a_parent, const char* a_name)
-  : KTextEdit(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)), mSeenEOL(false), mProcess(0)
+  : KTextEdit(a_parent, a_name), KommanderWidget(this), mSeenEOL(false), mProcess(0)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/label.cpp b/kommander/widgets/label.cpp
index 31d0adac..ee422325 100644
--- a/kommander/widgets/label.cpp
+++ b/kommander/widgets/label.cpp
@@ -26,7 +26,7 @@
 #include "label.h"
 
 Label::Label(TQWidget *a_parent, const char *a_name)
-  : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : TQLabel(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/lineedit.cpp b/kommander/widgets/lineedit.cpp
index 7a01ae4e..08c8b21f 100644
--- a/kommander/widgets/lineedit.cpp
+++ b/kommander/widgets/lineedit.cpp
@@ -31,7 +31,7 @@ enum functions {
 };
 
 LineEdit::LineEdit(TQWidget *a_parent, const char *a_name)
-	: KLineEdit(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+	: KLineEdit(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp
index 5d067f9c..b1d465c6 100644
--- a/kommander/widgets/listbox.cpp
+++ b/kommander/widgets/listbox.cpp
@@ -30,7 +30,7 @@
 #include "listbox.h"
 
 ListBox::ListBox(TQWidget *a_parent, const char *a_name)
-  : TDEListBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : TDEListBox(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/pixmaplabel.cpp b/kommander/widgets/pixmaplabel.cpp
index a9298530..3d71ab1e 100644
--- a/kommander/widgets/pixmaplabel.cpp
+++ b/kommander/widgets/pixmaplabel.cpp
@@ -31,7 +31,7 @@
 #include "pixmaplabel.h"
 
 PixmapLabel::PixmapLabel(TQWidget *a_parent, const char *a_name)
-  : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : TQLabel(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp
index 7a570dd3..e4d26ecd 100644
--- a/kommander/widgets/popupmenu.cpp
+++ b/kommander/widgets/popupmenu.cpp
@@ -38,7 +38,7 @@
 #define LAST_FUNCTION INSERTSUBMENU 
 
 PopupMenu::PopupMenu(TQWidget *parent, const char *name)
- : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this))
+ : TQLabel(parent, name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/progressbar.cpp b/kommander/widgets/progressbar.cpp
index 111ffe9f..88e253e9 100644
--- a/kommander/widgets/progressbar.cpp
+++ b/kommander/widgets/progressbar.cpp
@@ -36,7 +36,7 @@ enum Functions {
 };
 
 ProgressBar::ProgressBar(TQWidget *a_parent, const char *a_name)
-  : KProgress(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : KProgress(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/radiobutton.cpp b/kommander/widgets/radiobutton.cpp
index d6306c80..ba46248d 100644
--- a/kommander/widgets/radiobutton.cpp
+++ b/kommander/widgets/radiobutton.cpp
@@ -28,7 +28,7 @@
 #include "radiobutton.h"
 
 RadioButton::RadioButton(TQWidget *a_parent, const char *a_name)
-  : TQRadioButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : TQRadioButton(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "unchecked";
diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp
index 3233ea8f..4c62b167 100644
--- a/kommander/widgets/richtexteditor.cpp
+++ b/kommander/widgets/richtexteditor.cpp
@@ -43,7 +43,7 @@
 #include "pixmaps/textright.xpm"
 
 RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name)
-	: TQWidget(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+	: TQWidget(a_parent, a_name), KommanderWidget(this)
 {
 
 	TQStringList states;
diff --git a/kommander/widgets/scriptobject.cpp b/kommander/widgets/scriptobject.cpp
index 514c4ae5..2b444471 100644
--- a/kommander/widgets/scriptobject.cpp
+++ b/kommander/widgets/scriptobject.cpp
@@ -30,7 +30,7 @@
 #include <specials.h>
 
 ScriptObject::ScriptObject(TQWidget *a_parent, const char *a_name)
-  : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : TQLabel(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/slider.cpp b/kommander/widgets/slider.cpp
index b8068ede..8c7d06bf 100644
--- a/kommander/widgets/slider.cpp
+++ b/kommander/widgets/slider.cpp
@@ -23,7 +23,7 @@
 #include "slider.h"
 
 Slider::Slider(TQWidget * a_parent, const char *a_name)
-  : TQSlider(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : TQSlider(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/spinboxint.cpp b/kommander/widgets/spinboxint.cpp
index 72991376..a2b9af6a 100644
--- a/kommander/widgets/spinboxint.cpp
+++ b/kommander/widgets/spinboxint.cpp
@@ -28,7 +28,7 @@
 #include "spinboxint.h"
 
 SpinBoxInt::SpinBoxInt(TQWidget *a_parent, const char *a_name)
-  : TQSpinBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : TQSpinBox(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/statusbar.cpp b/kommander/widgets/statusbar.cpp
index 3c5e76f5..0a3a249f 100644
--- a/kommander/widgets/statusbar.cpp
+++ b/kommander/widgets/statusbar.cpp
@@ -27,7 +27,7 @@
 #include "statusbar.h"
 
 StatusBar::StatusBar(TQWidget *a_parent, const char *a_name)
-  : KStatusBar(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : KStatusBar(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/subdialog.cpp b/kommander/widgets/subdialog.cpp
index 47e4ec69..292ac541 100644
--- a/kommander/widgets/subdialog.cpp
+++ b/kommander/widgets/subdialog.cpp
@@ -32,7 +32,7 @@
 #include "subdialog.h"
 
 SubDialog::SubDialog(TQWidget *a_parent, const char *a_name)
-  : TQPushButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)), m_dialog(0)
+  : TQPushButton(a_parent, a_name), KommanderWidget(this), m_dialog(0)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/table.cpp b/kommander/widgets/table.cpp
index 252dbcee..6a8abc4b 100644
--- a/kommander/widgets/table.cpp
+++ b/kommander/widgets/table.cpp
@@ -48,7 +48,7 @@ enum Functions {
 
 
 Table::Table(TQWidget *a_parent, const char *a_name)
-  : TQTable(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : TQTable(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
@@ -131,7 +131,7 @@ void Table::setCellWidget(int row, int col, const TQString & _widgetName)
   KommanderWidget *w = widgetByName(_widgetName);
   if (w)
   {
-    TQWidget *widget = TQT_TQWIDGET(w->object());
+    TQWidget *widget = static_cast<TQWidget*>(w->object());
     if (TQTable::cellWidget(row, col) != widget)
     { 
       setCurrentCell(-1, -1); //hack to not delete the cellwidget after clicking away to another cell. 
diff --git a/kommander/widgets/tabwidget.cpp b/kommander/widgets/tabwidget.cpp
index 7180a7d0..b4116fe3 100644
--- a/kommander/widgets/tabwidget.cpp
+++ b/kommander/widgets/tabwidget.cpp
@@ -44,7 +44,7 @@ enum Functions {
 };
 
 TabWidget::TabWidget(TQWidget *a_parent, const char *a_name, int a_flags)
-	: TQTabWidget(a_parent, a_name, a_flags), KommanderWidget(TQT_TQOBJECT(this))
+	: TQTabWidget(a_parent, a_name, a_flags), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/textbrowser.cpp b/kommander/widgets/textbrowser.cpp
index 4abaa706..5a6e1576 100644
--- a/kommander/widgets/textbrowser.cpp
+++ b/kommander/widgets/textbrowser.cpp
@@ -35,7 +35,7 @@ enum Functions {
 };
 
 TextBrowser::TextBrowser(TQWidget * a_parent, const char *a_name)
-  : KTextBrowser(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : KTextBrowser(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/textedit.cpp b/kommander/widgets/textedit.cpp
index aa2b7c9d..be607aa4 100644
--- a/kommander/widgets/textedit.cpp
+++ b/kommander/widgets/textedit.cpp
@@ -43,7 +43,7 @@ enum Functions {
 };
 
 TextEdit::TextEdit(TQWidget * a_parent, const char *a_name):KTextEdit(a_parent, a_name),
-KommanderWidget(TQT_TQOBJECT(this))
+KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/timer.cpp b/kommander/widgets/timer.cpp
index b91d0eb5..c5f1f6ce 100644
--- a/kommander/widgets/timer.cpp
+++ b/kommander/widgets/timer.cpp
@@ -38,7 +38,7 @@ enum Functions {
 };
 
 Timer::Timer(TQWidget *a_parent, const char *a_name)
-  : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : TQLabel(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp
index 4df6b78e..0bebe1bb 100644
--- a/kommander/widgets/toolbox.cpp
+++ b/kommander/widgets/toolbox.cpp
@@ -33,7 +33,7 @@
 #define LAST_FUNCTION INDEXOF 
 
 ToolBox::ToolBox(TQWidget *parent, const char *name)
- : TQToolBox(parent, name), KommanderWidget(TQT_TQOBJECT(this))
+ : TQToolBox(parent, name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp
index 15949534..c2d6f87a 100644
--- a/kommander/widgets/treewidget.cpp
+++ b/kommander/widgets/treewidget.cpp
@@ -55,7 +55,7 @@ enum Functions {
 };
 
 TreeWidget::TreeWidget(TQWidget *a_parent, const char *a_name)
-  : TDEListView(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : TDEListView(a_parent, a_name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/wizard.cpp b/kommander/widgets/wizard.cpp
index 797ed009..fd2c0703 100644
--- a/kommander/widgets/wizard.cpp
+++ b/kommander/widgets/wizard.cpp
@@ -32,7 +32,7 @@
 
 
 Wizard::Wizard(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags)
-  : TQWizard(a_parent, a_name, a_modal, a_flags), KommanderWidget(TQT_TQOBJECT(this))
+  : TQWizard(a_parent, a_name, a_modal, a_flags), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";