Replaced various '#define' with actual strings - part 6

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

13 files changed, 27 insertions, 27 deletions

diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 86373504..2c8b36c8 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -304,7 +304,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
     // How about names like "__" or "123" for project name? Are they legal?
     TQRegExpValidator *appname_edit_validator;
     appname_edit_validator = new TQRegExpValidator (appname_regexp,
-                                                   TQT_TQOBJECT(appname_edit),
+                                                   appname_edit,
                                                    "AppNameValidator");
     appname_edit->setValidator(appname_edit_validator);
 
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index 22b865ef..726c71a6 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -71,28 +71,28 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part )
     m_actionViewMode->setItems( lst );
     m_actionViewMode->setWhatsThis(i18n("<b>View mode</b><p>Class browser items can be grouped by directories, listed in a plain or java like view."));
 
-    m_actionNewClass = new TDEAction( i18n("New Class..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotNewClass()),
+    m_actionNewClass = new TDEAction( i18n("New Class..."), TDEShortcut(), this, TQT_SLOT(slotNewClass()),
 				    m_part->actionCollection(), "classview_new_class" );
     m_actionNewClass->setWhatsThis(i18n("<b>New class</b><p>Calls the <b>New Class</b> wizard."));
 	
-	m_actionCreateAccessMethods = new TDEAction( i18n("Create get/set Methods"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" );
+	m_actionCreateAccessMethods = new TDEAction( i18n("Create get/set Methods"), TDEShortcut(), this, TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" );
 	
 	
-    m_actionAddMethod = new TDEAction( i18n("Add Method..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddMethod()),
+    m_actionAddMethod = new TDEAction( i18n("Add Method..."), TDEShortcut(), this, TQT_SLOT(slotAddMethod()),
 				    m_part->actionCollection(), "classview_add_method" );
     m_actionAddMethod->setWhatsThis(i18n("<b>Add method</b><p>Calls the <b>New Method</b> wizard."));
-    m_actionAddAttribute = new TDEAction( i18n("Add Attribute..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddAttribute()),
+    m_actionAddAttribute = new TDEAction( i18n("Add Attribute..."), TDEShortcut(), this, TQT_SLOT(slotAddAttribute()),
 				    m_part->actionCollection(), "classview_add_attribute" );
     m_actionAddAttribute->setWhatsThis(i18n("<b>Add attribute</b><p>Calls the <b>New Attribute</b> wizard."));
 
-    m_actionOpenDeclaration = new TDEAction( i18n("Open Declaration"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenDeclaration()),
+    m_actionOpenDeclaration = new TDEAction( i18n("Open Declaration"), TDEShortcut(), this, TQT_SLOT(slotOpenDeclaration()),
 				    m_part->actionCollection(), "classview_open_declaration" );
     m_actionOpenDeclaration->setWhatsThis(i18n("<b>Open declaration</b><p>Opens a file where the selected item is declared and jumps to the declaration line."));
-    m_actionOpenImplementation = new TDEAction( i18n("Open Implementation"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenImplementation()),
+    m_actionOpenImplementation = new TDEAction( i18n("Open Implementation"), TDEShortcut(), this, TQT_SLOT(slotOpenImplementation()),
 				    m_part->actionCollection(), "classview_open_implementation" );
     m_actionOpenImplementation->setWhatsThis(i18n("<b>Open implementation</b><p>Opens a file where the selected item is defined (implemented) and jumps to the definition line."));
 
-	m_actionFollowEditor = new TDEToggleAction( i18n("Follow Editor"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" );
+	m_actionFollowEditor = new TDEToggleAction( i18n("Follow Editor"), TDEShortcut(), this, TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" );
 
     TDEConfig* config = m_part->instance()->config();
     config->setGroup( "General" );
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index b52b8b25..997da11a 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -229,7 +229,7 @@ void DiffWidget::loadExtPart( const TQString& partName )
   if ( !extService )
     return;
 
-  extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, TQT_TQOBJECT(this), 0 );
+  extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, this, 0 );
   if ( !extPart || !extPart->widget() )
     return;
 
diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp
index 85365f69..ee6c639a 100644
--- a/parts/documentation/find_documentation.cpp
+++ b/parts/documentation/find_documentation.cpp
@@ -46,10 +46,10 @@ FindDocumentation::FindDocumentation(DocumentationWidget* parent, const char* na
     man_item(0), info_item(0), index_item(0), google_item(0), contents_item(0),
     last_item(0), m_widget(parent)
 {
-    TQWidget* tmp = TQT_TQWIDGET(TQApplication::desktop());
+    TQWidget* tmp = TQApplication::desktop();
     setGeometry(tmp->width()/2 - width()/2, tmp->height()/2 - height()/2, width(), height());
-    proc_man = new TDEProcess( TQT_TQOBJECT(this) );
-    proc_info = new TDEProcess( TQT_TQOBJECT(this) );
+    proc_man = new TDEProcess( this );
+    proc_info = new TDEProcess( this );
 
     connect( proc_man, TQT_SIGNAL(processExited( TDEProcess* )),
                 this, TQT_SLOT(procManExited( TDEProcess* )) );
diff --git a/parts/doxygen/input.h b/parts/doxygen/input.h
index ae4a2d55..97599f37 100644
--- a/parts/doxygen/input.h
+++ b/parts/doxygen/input.h
@@ -44,7 +44,7 @@ public:
     
     void init();
     virtual void setEnabled(bool b);
-    virtual TQObject *qobject() { return TQT_TQOBJECT(this); }
+    virtual TQObject *qobject() { return this; }
     virtual bool getState() const { return state; }
 
 signals:
@@ -73,7 +73,7 @@ public:
     
     void init();
     virtual void setEnabled(bool);
-    TQObject *qobject() { return TQT_TQOBJECT(this); }
+    TQObject *qobject() { return this; }
 
 signals:
     void changed();
@@ -109,7 +109,7 @@ public:
     void init();
     void addValue(const char *s);
     void setEnabled(bool);
-    TQObject *qobject() { return TQT_TQOBJECT(this); }
+    TQObject *qobject() { return this; }
 
 signals:
     void changed();
@@ -149,7 +149,7 @@ public:
 
     void init();
     void setEnabled(bool);
-    TQObject *qobject() { return TQT_TQOBJECT(this); }
+    TQObject *qobject() { return this; }
 
 signals:
     void changed();
diff --git a/parts/filecreate/fctemplateeditbase.ui.h b/parts/filecreate/fctemplateeditbase.ui.h
index 5750f988..66296b44 100644
--- a/parts/filecreate/fctemplateeditbase.ui.h
+++ b/parts/filecreate/fctemplateeditbase.ui.h
@@ -22,5 +22,5 @@
 
 void FCTemplateEditBase::init()
 {
-    templatename_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), TQT_TQOBJECT(this)));
+    templatename_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), this));
 }
diff --git a/parts/filecreate/fctypeeditbase.ui.h b/parts/filecreate/fctypeeditbase.ui.h
index 07576b6b..0ddc4f1e 100644
--- a/parts/filecreate/fctypeeditbase.ui.h
+++ b/parts/filecreate/fctypeeditbase.ui.h
@@ -22,5 +22,5 @@
 
 void FCTypeEditBase::init()
 {
-    typeext_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), TQT_TQOBJECT(this)));
+    typeext_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), this));
 }
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index 30b56f9d..84fe2bb9 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -186,7 +186,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
 
     // tdeaction for the dir sync method
     acSyncDir = new TDEAction( i18n("Current Document Directory"), "dirsynch", 0,
-                             TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
+                             this, TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
     toolbar->setIconText( TDEToolBar::IconOnly );
     toolbar->setIconSize( 16 );
     toolbar->setEnableContextMenu( false );
diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp
index b99427ec..7b82f256 100644
--- a/parts/fileview/filegroupswidget.cpp
+++ b/parts/fileview/filegroupswidget.cpp
@@ -179,12 +179,12 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part)
              this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
 
     m_actionToggleShowNonProjectFiles = new TDEToggleAction( i18n("Show Non Project Files"), TDEShortcut(),
-	TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowNonProjectFiles()), TQT_TQOBJECT(this), "actiontoggleshowshownonprojectfiles" );
+	this, TQT_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" );
     m_actionToggleShowNonProjectFiles->setCheckedState(i18n("Hide Non Project Files"));
     m_actionToggleShowNonProjectFiles->setWhatsThis(i18n("<b>Show non project files</b><p>Shows files that do not belong to a project in a file tree."));
 
     m_actionToggleDisplayLocation = new TDEToggleAction( i18n("Display Location Column"), TDEShortcut(),
-        TQT_TQOBJECT(this), TQT_SLOT(slotToggleDisplayLocation()), TQT_TQOBJECT(this), "actiontoggleshowlocation" );
+        this, TQT_SLOT(slotToggleDisplayLocation()), this, "actiontoggleshowlocation" );
     m_actionToggleDisplayLocation->setWhatsThis(i18n("<b>Display the Location Column</b><p>Displays a column with the location of the files."));
 
     m_part = part;
diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp
index af6f9e1f..66e74e4d 100644
--- a/parts/fileview/filetreeviewwidgetimpl.cpp
+++ b/parts/fileview/filetreeviewwidgetimpl.cpp
@@ -63,7 +63,7 @@ FileTreeViewWidgetImpl::~FileTreeViewWidgetImpl()
 
 FileTreeWidget *FileTreeViewWidgetImpl::fileTree() const
 {
-    return static_cast<FileTreeWidget *>( TQT_TQWIDGET(parent()) );
+    return static_cast<FileTreeWidget *>( parent() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp
index 6333805f..fc083382 100644
--- a/parts/grepview/grepdlg.cpp
+++ b/parts/grepview/grepdlg.cpp
@@ -173,7 +173,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
     layout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter);
 
     files_combo = new KComboBox(true, this);
-    files_label->setBuddy(TQT_TQWIDGET(files_combo->focusProxy()));
+    files_label->setBuddy(files_combo->focusProxy());
     files_combo->insertStrList(filepatterns);
     layout->addWidget(files_combo, 5, 1);
 
@@ -182,7 +182,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
 
     TQStringList exclude_list = config->readListEntry("exclude_patterns");
     exclude_combo = new KComboBox(true, this);
-    exclude_label->setBuddy(TQT_TQWIDGET(files_combo->focusProxy()));
+    exclude_label->setBuddy(files_combo->focusProxy());
     if (exclude_list.count()) {
         exclude_combo->insertStringList(exclude_list);
     }
diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp
index 2df7d384..b27f893d 100644
--- a/parts/outputviews/makeviewpart.cpp
+++ b/parts/outputviews/makeviewpart.cpp
@@ -52,11 +52,11 @@ MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringLis
     mainWindow()->embedOutputView(m_widget, i18n("Messages"), i18n("Compiler output messages"));
 
     TDEAction *action;
-    action = new TDEAction( i18n("&Next Error"), Key_F4, TQT_TQOBJECT(m_widget), TQT_SLOT(nextError()),
+    action = new TDEAction( i18n("&Next Error"), Key_F4, m_widget, TQT_SLOT(nextError()),
                           actionCollection(), "view_next_error");
     action->setToolTip( i18n("Go to the next error") );
     action->setWhatsThis(i18n("<b>Next error</b><p>Switches to the file and line where the next error was reported from."));
-    action = new TDEAction( i18n("&Previous Error"), SHIFT+Key_F4, TQT_TQOBJECT(m_widget), TQT_SLOT(prevError()),
+    action = new TDEAction( i18n("&Previous Error"), SHIFT+Key_F4, m_widget, TQT_SLOT(prevError()),
                           actionCollection(), "view_previous_error");
     action->setToolTip( i18n("Go to the previous error") );
     action->setWhatsThis(i18n("<b>Previous error</b><p>Switches to the file and line where the previous error was reported from."));
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 78b3a386..eee8adab 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -178,7 +178,7 @@ MakeWidget::MakeWidget(MakeViewPart *part)
 
         dirstack.setAutoDelete(true);
 
-	childproc = new TDEProcess(TQT_TQOBJECT(this));
+	childproc = new TDEProcess(this);
 	procLineMaker = new ProcessLineMaker( childproc );
 
 	connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)),