Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

27 files changed, 152 insertions, 152 deletions

diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp
index 7e643d66..87db2425 100644
--- a/lib/widgets/flagboxes.cpp
+++ b/lib/widgets/flagboxes.cpp
@@ -320,7 +320,7 @@ FlagPathEdit::FlagPathEdit( TQWidget * parent, TQString pathDelimiter,
         layout->addWidget(edit);
         details = new TQPushButton("...", this);
         details->setMaximumWidth(30);
-        connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPathDetails()));
+        connect(details, TQ_SIGNAL(clicked()), this, TQ_SLOT(showPathDetails()));
         layout->addWidget(details);
     }
 
@@ -540,7 +540,7 @@ FlagListEdit::FlagListEdit( TQWidget * parent, TQString listDelimiter, FlagEditC
     {
         details = new TQPushButton("...", this);
         details->setMaximumWidth(30);
-        connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showListDetails()));
+        connect(details, TQ_SIGNAL(clicked()), this, TQ_SLOT(showListDetails()));
         layout->addWidget(details);
     }
 
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index a8520e30..8fdec94e 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -24,54 +24,54 @@ KDevHTMLPart::KDevHTMLPart()
 {
   setXMLFile(locate("data", "tdevelop/kdevhtml_partui.rc"), true);
   
-  connect(browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)),
-          this, TQT_SLOT(openURLRequest(const KURL &)) );
+  connect(browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)),
+          this, TQ_SLOT(openURLRequest(const KURL &)) );
 
-  connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(slotStarted(TDEIO::Job* )));
-  connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()));
-  connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &)));
+  connect(this, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(slotStarted(TDEIO::Job* )));
+  connect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted()));
+  connect(this, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotCancelled(const TQString &)));
 
   TDEActionCollection * actions = actionCollection();// new TDEActionCollection( this );
   reloadAction = new TDEAction( i18n( "Reload" ), "reload", 0,
-    this, TQT_SLOT( slotReload() ), actions, "doc_reload" );
+    this, TQ_SLOT( slotReload() ), actions, "doc_reload" );
   reloadAction->setWhatsThis(i18n("<b>Reload</b><p>Reloads the current document."));
   stopAction = new TDEAction( i18n( "Stop" ), "process-stop", 0,
-    this, TQT_SLOT( slotStop() ), actions, "doc_stop" );
+    this, TQ_SLOT( slotStop() ), actions, "doc_stop" );
   stopAction->setWhatsThis(i18n("<b>Stop</b><p>Stops the loading of current document."));
   duplicateAction = new TDEAction( i18n( "Duplicate Tab" ), "window-new", 0,
-    this, TQT_SLOT( slotDuplicate() ), actions, "doc_dup" );
+    this, TQ_SLOT( slotDuplicate() ), actions, "doc_dup" );
   duplicateAction->setWhatsThis(i18n("<b>Duplicate window</b><p>Opens current document in a new window."));
-  printAction = KStdAction::print(this, TQT_SLOT(slotPrint()), actions, "print_doc");
-  copyAction = KStdAction::copy(this, TQT_SLOT(slotCopy()), actions, "copy_doc_selection");
+  printAction = KStdAction::print(this, TQ_SLOT(slotPrint()), actions, "print_doc");
+  copyAction = KStdAction::copy(this, TQ_SLOT(slotCopy()), actions, "copy_doc_selection");
 
-  connect( this, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(popup(const TQString &, const TQPoint &)));
-  connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
+  connect( this, TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQ_SLOT(popup(const TQString &, const TQPoint &)));
+  connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
 
 //BEGIN documentation history stuff  
     
   m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0,
-    this, TQT_SLOT(slotBack()),
+    this, TQ_SLOT(slotBack()),
     actions, "browser_back");
   m_backAction->setEnabled( false );
   m_backAction->setToolTip(i18n("Back"));
   m_backAction->setWhatsThis(i18n("<b>Back</b><p>Moves backwards one step in the <b>documentation</b> browsing history."));
 
-  connect(m_backAction->popupMenu(), TQT_SIGNAL(aboutToShow()),
-         this, TQT_SLOT(slotBackAboutToShow()));
-  connect(m_backAction->popupMenu(), TQT_SIGNAL(activated(int)),
-         this, TQT_SLOT(slotPopupActivated(int)));
+  connect(m_backAction->popupMenu(), TQ_SIGNAL(aboutToShow()),
+         this, TQ_SLOT(slotBackAboutToShow()));
+  connect(m_backAction->popupMenu(), TQ_SIGNAL(activated(int)),
+         this, TQ_SLOT(slotPopupActivated(int)));
 
   m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0,
-    this, TQT_SLOT(slotForward()),
+    this, TQ_SLOT(slotForward()),
     actions, "browser_forward");
   m_forwardAction->setEnabled( false );
   m_forwardAction->setToolTip(i18n("Forward"));
   m_forwardAction->setWhatsThis(i18n("<b>Forward</b><p>Moves forward one step in the <b>documentation</b> browsing history."));
 
-  connect(m_forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()),
-         this, TQT_SLOT(slotForwardAboutToShow()));
-  connect(m_forwardAction->popupMenu(), TQT_SIGNAL(activated(int)),
-         this, TQT_SLOT(slotPopupActivated(int)));
+  connect(m_forwardAction->popupMenu(), TQ_SIGNAL(aboutToShow()),
+         this, TQ_SLOT(slotForwardAboutToShow()));
+  connect(m_forwardAction->popupMenu(), TQ_SIGNAL(activated(int)),
+         this, TQ_SLOT(slotPopupActivated(int)));
   
   m_restoring = false;
   m_Current = m_history.end();
@@ -479,9 +479,9 @@ void KDevHTMLPart::slotCopy( )
     TQString text = selectedText();
     text.replace( TQChar( 0xa0 ), ' ' );
     TQClipboard *cb = TQApplication::clipboard();
-    disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
+    disconnect( cb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotClearSelection() ) );
     cb->setText(text);
-    connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
+    connect( cb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotClearSelection() ) );
 }
 
 void KDevHTMLPart::slotSelectionChanged( )
diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp
index 75682116..7a9ed47b 100644
--- a/lib/widgets/kdevtabwidget.cpp
+++ b/lib/widgets/kdevtabwidget.cpp
@@ -22,8 +22,8 @@ KDevTabWidget::KDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(p
 {
   m_pTabBar = new KTabBar(this, "tabbar");
   setTabBar(m_pTabBar);
-  connect(m_pTabBar, TQT_SIGNAL(closeWindow(const TQWidget*)), this, TQT_SIGNAL(closeWindow(const TQWidget*)));
-  connect(m_pTabBar, TQT_SIGNAL(closeOthers(TQWidget*)), this, TQT_SIGNAL(closeOthers(TQWidget*)));
+  connect(m_pTabBar, TQ_SIGNAL(closeWindow(const TQWidget*)), this, TQ_SIGNAL(closeWindow(const TQWidget*)));
+  connect(m_pTabBar, TQ_SIGNAL(closeOthers(TQWidget*)), this, TQ_SIGNAL(closeOthers(TQWidget*)));
 }
 
 KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name)
@@ -34,8 +34,8 @@ KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name)
   if (closePixmap.isNull())
     closePixmap = SmallIcon("window-close");
 
-  m_pPopupMenu->insertItem(closePixmap, i18n("&Close"), this, TQT_SLOT(closeWindowSlot()));
-  m_pPopupMenu->insertItem(i18n("Close &Others"), this, TQT_SLOT(closeOthersSlot()));
+  m_pPopupMenu->insertItem(closePixmap, i18n("&Close"), this, TQ_SLOT(closeWindowSlot()));
+  m_pPopupMenu->insertItem(i18n("Close &Others"), this, TQ_SLOT(closeOthersSlot()));
 }
 
 void KTabBar::closeWindowSlot()
diff --git a/lib/widgets/ksavealldialog.cpp b/lib/widgets/ksavealldialog.cpp
index 9690e8a4..a98ce92a 100644
--- a/lib/widgets/ksavealldialog.cpp
+++ b/lib/widgets/ksavealldialog.cpp
@@ -79,9 +79,9 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co
 		++it;
 	}
 
-	connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) );
-	connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(save()) );
-	connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(saveNone()) );
+	connect( this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(cancel()) );
+	connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(save()) );
+	connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(saveNone()) );
 }
 
 KSaveSelectDialog::~KSaveSelectDialog() {}
@@ -159,9 +159,9 @@ KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent
   setButtonTip( User1, i18n("Lose all modifications") );
   setButtonTip( Close, i18n("Cancels the action") );
 
-  connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) );
-  connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(saveAll()) );
-  connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(revert()) );
+  connect( this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(cancel()) );
+  connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(saveAll()) );
+  connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(revert()) );
 }
 
 KSaveAllDialog::~KSaveAllDialog()
diff --git a/lib/widgets/processlinemaker.cpp b/lib/widgets/processlinemaker.cpp
index 113b206b..be881aa3 100644
--- a/lib/widgets/processlinemaker.cpp
+++ b/lib/widgets/processlinemaker.cpp
@@ -28,11 +28,11 @@ ProcessLineMaker::ProcessLineMaker()
 
 ProcessLineMaker::ProcessLineMaker( const TDEProcess* proc )
 {
-    connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
-            this, TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) );
+    connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+            this, TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) );
 
-    connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
-            this, TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) );
+    connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+            this, TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) );
 }
 
 void ProcessLineMaker::slotReceivedStdout( const char *buffer )
diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp
index f3088c88..7d8a4d3b 100644
--- a/lib/widgets/processwidget.cpp
+++ b/lib/widgets/processwidget.cpp
@@ -117,17 +117,17 @@ ProcessWidget::ProcessWidget(TQWidget *parent, const char *name)
 
     procLineMaker = new ProcessLineMaker( childproc );
 
-    connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)),
-             this, TQT_SLOT(insertStdoutLine(const TQCString&) ));
-    connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)),
-             this, TQT_SLOT(insertStderrLine(const TQCString&) ));
-    connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)),
-             this, TQT_SLOT(addPartialStdoutLine(const TQCString&) ));
-    connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)),
-             this, TQT_SLOT(addPartialStderrLine(const TQCString&) ));
-
-    connect(childproc, TQT_SIGNAL(processExited(TDEProcess*)),
-            this, TQT_SLOT(slotProcessExited(TDEProcess*) )) ;
+    connect( procLineMaker, TQ_SIGNAL(receivedStdoutLine(const TQCString&)),
+             this, TQ_SLOT(insertStdoutLine(const TQCString&) ));
+    connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)),
+             this, TQ_SLOT(insertStderrLine(const TQCString&) ));
+    connect( procLineMaker, TQ_SIGNAL(receivedPartialStdoutLine(const TQCString&)),
+             this, TQ_SLOT(addPartialStdoutLine(const TQCString&) ));
+    connect( procLineMaker, TQ_SIGNAL(receivedPartialStderrLine(const TQCString&)),
+             this, TQ_SLOT(addPartialStderrLine(const TQCString&) ));
+
+    connect(childproc, TQ_SIGNAL(processExited(TDEProcess*)),
+            this, TQ_SLOT(slotProcessExited(TDEProcess*) )) ;
 }
 
 
diff --git a/lib/widgets/propeditor/pcheckbox.cpp b/lib/widgets/propeditor/pcheckbox.cpp
index 6e9c06b7..951fad34 100644
--- a/lib/widgets/propeditor/pcheckbox.cpp
+++ b/lib/widgets/propeditor/pcheckbox.cpp
@@ -39,7 +39,7 @@ PCheckBox::PCheckBox(MultiProperty *property, TQWidget *parent, const char *name
     m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
-    connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool)));
+    connect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool)));
 }
 
 TQVariant PCheckBox::value() const
@@ -49,9 +49,9 @@ TQVariant PCheckBox::value() const
 
 void PCheckBox::setValue(const TQVariant &value, bool emitChange)
 {
-    disconnect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool)));
+    disconnect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool)));
     m_edit->setChecked(value.toBool());
-    connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool)));
+    connect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
diff --git a/lib/widgets/propeditor/pcolorbutton.cpp b/lib/widgets/propeditor/pcolorbutton.cpp
index 4b6ae5c4..9c42f4a6 100644
--- a/lib/widgets/propeditor/pcolorbutton.cpp
+++ b/lib/widgets/propeditor/pcolorbutton.cpp
@@ -39,10 +39,10 @@ PColorButton::PColorButton(MultiProperty* property, TQWidget* parent, const char
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 #ifndef PURE_QT
     m_edit = new KColorButton(this);
-    connect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&)));
+    connect(m_edit, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updateProperty(const TQColor&)));
 #else
     m_edit = new TQPushButton(this);
-    connect(m_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeColor()));
+    connect(m_edit, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeColor()));
 #endif
 
     m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
@@ -78,9 +78,9 @@ void PColorButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect
 void PColorButton::setValue(const TQVariant& value, bool emitChange)
 {
 #ifndef PURE_QT
-    disconnect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&)));
+    disconnect(m_edit, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updateProperty(const TQColor&)));
     m_edit->setColor(value.toColor());
-    connect(m_edit, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updateProperty(const TQColor&)));
+    connect(m_edit, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updateProperty(const TQColor&)));
 #else
     m_color = value.toColor();
     m_edit->setText(m_color.name());
diff --git a/lib/widgets/propeditor/pcolorcombo.cpp b/lib/widgets/propeditor/pcolorcombo.cpp
index 23c61f46..78fd9dc3 100644
--- a/lib/widgets/propeditor/pcolorcombo.cpp
+++ b/lib/widgets/propeditor/pcolorcombo.cpp
@@ -34,7 +34,7 @@ PColorCombo::PColorCombo(MultiProperty *property, TQWidget *parent, const char *
     m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 
-    connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
+    connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int)));
 }
 
 TQVariant PColorCombo::value() const
@@ -44,9 +44,9 @@ TQVariant PColorCombo::value() const
 
 void PColorCombo::setValue(const TQVariant &value, bool emitChange)
 {
-    disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
+    disconnect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int)));
     m_edit->setColor(value.toColor());
-    connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
+    connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp
index a0749744..ca42cda6 100644
--- a/lib/widgets/propeditor/pcombobox.cpp
+++ b/lib/widgets/propeditor/pcombobox.cpp
@@ -45,7 +45,7 @@ void PComboBox::init(bool rw)
     
     fillBox();
     
-    connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
+    connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int)));
 }
 
 void PComboBox::fillBox()
@@ -68,9 +68,9 @@ void PComboBox::setValue(const TQVariant &value, bool emitChange)
 {
     if (!value.isNull())
     {
-        disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
+        disconnect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int)));
         m_edit->setCurrentText(findDescription(value));
-        connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
+        connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int)));
         if (emitChange)
             emit propertyChanged(m_property, value);
     }
diff --git a/lib/widgets/propeditor/pdateedit.cpp b/lib/widgets/propeditor/pdateedit.cpp
index 113ec325..563552c3 100644
--- a/lib/widgets/propeditor/pdateedit.cpp
+++ b/lib/widgets/propeditor/pdateedit.cpp
@@ -33,7 +33,7 @@ PDateEdit::PDateEdit(MultiProperty* property, TQWidget* parent, const char* name
     m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
-    connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&)));
+    connect(m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(updateProperty(const TQDate&)));
 }
 
 TQVariant PDateEdit::value() const
@@ -51,9 +51,9 @@ void PDateEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r
 
 void PDateEdit::setValue(const TQVariant& value, bool emitChange)
 {
-    disconnect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&)));
+    disconnect(m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(updateProperty(const TQDate&)));
     m_edit->setDate(value.toDate());
-    connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&)));
+    connect(m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(updateProperty(const TQDate&)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
diff --git a/lib/widgets/propeditor/pdatetimeedit.cpp b/lib/widgets/propeditor/pdatetimeedit.cpp
index 55a0bdcc..8f4c03d3 100644
--- a/lib/widgets/propeditor/pdatetimeedit.cpp
+++ b/lib/widgets/propeditor/pdatetimeedit.cpp
@@ -32,7 +32,7 @@ PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* parent, const ch
     m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
-    connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&)));
+    connect(m_edit, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(updateProperty(const TQDateTime&)));
 }
 
 TQVariant PDateTimeEdit::value() const
@@ -50,9 +50,9 @@ void PDateTimeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRec
 
 void PDateTimeEdit::setValue(const TQVariant& value, bool emitChange)
 {
-    disconnect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&)));
+    disconnect(m_edit, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(updateProperty(const TQDateTime&)));
     m_edit->setDateTime(value.toDateTime());
-    connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&)));
+    connect(m_edit, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(updateProperty(const TQDateTime&)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
diff --git a/lib/widgets/propeditor/pdoublenuminput.cpp b/lib/widgets/propeditor/pdoublenuminput.cpp
index 99b0151e..b244935f 100644
--- a/lib/widgets/propeditor/pdoublenuminput.cpp
+++ b/lib/widgets/propeditor/pdoublenuminput.cpp
@@ -38,10 +38,10 @@ PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *parent, cons
 #ifndef PURE_QT
     m_edit = new KDoubleNumInput(-999999.0, 999999.0, 0.0, 0.01, 2, this);
     m_edit->setLabel(TQString());
-    connect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double)));
+    connect(m_edit, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(updateProperty(double)));
 #else
     m_edit = new TQFloatInput(-999999, 999999, 0.01, 2, this );
-    connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
+    connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int)));
 #endif
     m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 /*    m_edit->setMinValue(-999999999);
@@ -59,13 +59,13 @@ TQVariant PDoubleNumInput::value() const
 void PDoubleNumInput::setValue(const TQVariant &value, bool emitChange)
 {
 #ifndef PURE_QT
-    disconnect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double)));
+    disconnect(m_edit, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(updateProperty(double)));
     m_edit->setValue(value.toDouble());
-    connect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(updateProperty(double)));
+    connect(m_edit, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(updateProperty(double)));
 #else
-    disconnect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
+    disconnect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int)));
     m_edit->setValue(int(value.toDouble()*pow(m_edit->digits(),10)));
-    connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
+    connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int)));
 #endif
     if (emitChange)
         emit propertyChanged(m_property, value);
diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp
index 8932c4ae..7044e6c1 100644
--- a/lib/widgets/propeditor/pfontbutton.cpp
+++ b/lib/widgets/propeditor/pfontbutton.cpp
@@ -44,7 +44,7 @@ PFontButton::PFontButton(MultiProperty* property, TQWidget* parent, const char*
 #endif
     l->addWidget(m_edit);
 
-    connect(m_edit, TQT_SIGNAL(fontSelected(const TQFont& )), this, TQT_SLOT(updateProperty(const TQFont& )));
+    connect(m_edit, TQ_SIGNAL(fontSelected(const TQFont& )), this, TQ_SLOT(updateProperty(const TQFont& )));
 }
 
 TQVariant PFontButton::value() const
@@ -66,9 +66,9 @@ void PFontButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect&
 
 void PFontButton::setValue(const TQVariant& value, bool emitChange)
 {
-    disconnect(m_edit, TQT_SIGNAL(fontSelected(const TQFont&)), this, TQT_SLOT(updateProperty(const TQFont&)));
+    disconnect(m_edit, TQ_SIGNAL(fontSelected(const TQFont&)), this, TQ_SLOT(updateProperty(const TQFont&)));
     m_edit->setFont(value.toFont());
-    connect(m_edit, TQT_SIGNAL(fontSelected(const TQFont& )), this, TQT_SLOT(updateProperty(const TQFont& )));
+    connect(m_edit, TQ_SIGNAL(fontSelected(const TQFont& )), this, TQ_SLOT(updateProperty(const TQFont& )));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp
index cb8a80b2..224e4bd0 100644
--- a/lib/widgets/propeditor/pfontcombo.cpp
+++ b/lib/widgets/propeditor/pfontcombo.cpp
@@ -46,9 +46,9 @@ PFontCombo::PFontCombo(MultiProperty *property, TQWidget *parent, const char *na
 #ifdef PURE_QT
     TQFontDatabase fonts;
     m_edit->insertStringList(fonts.families());
-    connect(m_edit, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateProperty(const TQString&)));
+    connect(m_edit, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(updateProperty(const TQString&)));
 #else
-    connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
+    connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&)));
 #endif
 }
 
@@ -63,13 +63,13 @@ TQVariant PFontCombo::value() const
 
 void PFontCombo::setValue(const TQVariant &value, bool emitChange)
 {
-    disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
+    disconnect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&)));
 #ifndef PURE_QT
     m_edit->setCurrentFont(value.toString());
 #else
     m_edit->setCurrentText(value.toString());
 #endif
-    connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
+    connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
diff --git a/lib/widgets/propeditor/plineedit.cpp b/lib/widgets/propeditor/plineedit.cpp
index f5e1ecb0..c27a6b74 100644
--- a/lib/widgets/propeditor/plineedit.cpp
+++ b/lib/widgets/propeditor/plineedit.cpp
@@ -32,7 +32,7 @@ PLineEdit::PLineEdit(MultiProperty *property, TQWidget *parent, const char *name
     m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
-    connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
+    connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&)));
 }
 
 TQVariant PLineEdit::value() const
@@ -42,9 +42,9 @@ TQVariant PLineEdit::value() const
 
 void PLineEdit::setValue(const TQVariant &value, bool emitChange)
 {
-    disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
+    disconnect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&)));
     m_edit->setText(value.toString());
-    connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
+    connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
diff --git a/lib/widgets/propeditor/plinestyleedit.cpp b/lib/widgets/propeditor/plinestyleedit.cpp
index 996b1d0e..baa6224b 100644
--- a/lib/widgets/propeditor/plinestyleedit.cpp
+++ b/lib/widgets/propeditor/plinestyleedit.cpp
@@ -140,7 +140,7 @@ PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* parent, const
     m_edit->insertItem(TQPixmap(dashdot));
     m_edit->insertItem(TQPixmap(dashdotdot));    
 
-    connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
+    connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int)));
 }
 
 TQVariant PLineStyleEdit::value() const
@@ -186,9 +186,9 @@ void PLineStyleEdit::setValue(const TQVariant& value, bool emitChange)
         return;
     if ((value.toInt() > 5) || (value.toInt() < 0))
         return;
-    disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
+    disconnect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int)));
     m_edit->setCurrentItem(value.toInt());
-    connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
+    connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateProperty(int)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp
index 3241f892..0026ec31 100644
--- a/lib/widgets/propeditor/ppixmapedit.cpp
+++ b/lib/widgets/propeditor/ppixmapedit.cpp
@@ -61,7 +61,7 @@ PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* parent, const char*
     m_popup->hide();
     
 
-    connect(m_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateProperty()));
+    connect(m_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateProperty()));
 }
 
 TQVariant PPixmapEdit::value() const
diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp
index 987bb31b..0185b2e4 100644
--- a/lib/widgets/propeditor/propertyeditor.cpp
+++ b/lib/widgets/propeditor/propertyeditor.cpp
@@ -177,10 +177,10 @@ PropertyEditor::PropertyEditor(TQWidget *parent, const char *name)
 
     header()->setClickEnabled(false);
 
-    connect(header(), TQT_SIGNAL(sizeChange(int, int, int)),
-        this, TQT_SLOT(updateEditorSize()));
-    connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)),
-        this, TQT_SLOT(slotClicked(TQListViewItem*)));
+    connect(header(), TQ_SIGNAL(sizeChange(int, int, int)),
+        this, TQ_SLOT(updateEditorSize()));
+    connect(this, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+        this, TQ_SLOT(slotClicked(TQListViewItem*)));
 
     m_currentEditItem = 0;
     m_doubleClickForEdit = true;
@@ -199,7 +199,7 @@ PropertyEditor::PropertyEditor(TQWidget *parent, const char *name)
     m_undoButton->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
     m_undoButton->resize(m_undoButton->height(), m_undoButton->height());
     m_undoButton->hide();
-    connect(m_undoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(undo()));
+    connect(m_undoButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(undo()));
     m_currentEditLayout = new TQGridLayout(m_currentEditArea, 1, 2, 0, 0);
 //    m_currentEditLayout->addWidget(m_undoButton, 0, 1);
 }
@@ -214,7 +214,7 @@ void PropertyEditor::populateProperties(PropertyList *list)
     if (list == 0)
         return;
     m_list = list;
-    connect(m_list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(propertyValueChanged(Property*)));
+    connect(m_list, TQ_SIGNAL(propertyValueChanged(Property*)), this, TQ_SLOT(propertyValueChanged(Property*)));
     const TQValueList<TQPair<TQString, TQValueList<TQString> > >& groups = m_list->propertiesOfGroup();
     for (TQValueList<TQPair<TQString, TQValueList<TQString> > >::const_iterator it = groups.begin();
         it != groups.end(); ++it)
@@ -288,7 +288,7 @@ void PropertyEditor::clearProperties()
 
     hideEditor();
 
-    disconnect(m_list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(propertyValueChanged(Property*)));
+    disconnect(m_list, TQ_SIGNAL(propertyValueChanged(Property*)), this, TQ_SLOT(propertyValueChanged(Property*)));
     clear();
     delete m_list;
     m_list = 0;
@@ -445,8 +445,8 @@ Machine *PropertyEditor::machine(MultiProperty *property)
     if (m_registeredForType[name] == 0)
     {
         m_registeredForType[name] = PropertyMachineFactory::getInstance()->machineForProperty(property);
-        connect(m_registeredForType[name]->propertyEditor, TQT_SIGNAL(propertyChanged(MultiProperty*, const TQVariant&)),
-		this, TQT_SLOT(propertyChanged(MultiProperty*, const TQVariant&)));
+        connect(m_registeredForType[name]->propertyEditor, TQ_SIGNAL(propertyChanged(MultiProperty*, const TQVariant&)),
+		this, TQ_SLOT(propertyChanged(MultiProperty*, const TQVariant&)));
         m_registeredForType[name]->propertyEditor->reparent(m_currentEditArea, 0, m_currentEditArea->childrenRect().topLeft());
         m_registeredForType[name]->propertyEditor->hide();
     }
diff --git a/lib/widgets/propeditor/propertylist.cpp b/lib/widgets/propeditor/propertylist.cpp
index a5b43a3f..6ef367c2 100644
--- a/lib/widgets/propeditor/propertylist.cpp
+++ b/lib/widgets/propeditor/propertylist.cpp
@@ -327,7 +327,7 @@ void PropertyBuffer::intersect(const PropertyList *list)
 //        tqWarning("intersect::     removing %s from intersection", it.key().ascii());
         removeProperty(it.key());
     }
-    connect(list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(intersectedValueChanged(Property*)));
+    connect(list, TQ_SIGNAL(propertyValueChanged(Property*)), this, TQ_SLOT(intersectedValueChanged(Property*)));
 }
 
 void PropertyBuffer::intersectedValueChanged(Property *property)
@@ -359,7 +359,7 @@ PropertyBuffer::PropertyBuffer(PropertyList *list)
         addToGroup(list->m_groupOfProperty[it.data()], mp);
         m_list[it.key()] = mp;
     }
-    connect(list, TQT_SIGNAL(propertyValueChanged(Property*)), this, TQT_SLOT(intersectedValueChanged(Property*)));
+    connect(list, TQ_SIGNAL(propertyValueChanged(Property*)), this, TQ_SLOT(intersectedValueChanged(Property*)));
 }
 
 }
diff --git a/lib/widgets/propeditor/pspinbox.cpp b/lib/widgets/propeditor/pspinbox.cpp
index 755041c1..cb15bebb 100644
--- a/lib/widgets/propeditor/pspinbox.cpp
+++ b/lib/widgets/propeditor/pspinbox.cpp
@@ -34,7 +34,7 @@ PSpinBox::PSpinBox(MultiProperty *property, TQWidget *parent, const char *name)
     m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
-    connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
+    connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int)));
 }
 
 PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step, TQWidget *parent, const char *name)
@@ -44,7 +44,7 @@ PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step
     m_edit = new TQSpinBox(minValue, maxValue, step, this);
     l->addWidget(m_edit);
     
-    connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
+    connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int)));
 }
 
 TQVariant PSpinBox::value() const
@@ -54,9 +54,9 @@ TQVariant PSpinBox::value() const
 
 void PSpinBox::setValue(const TQVariant &value, bool emitChange)
 {
-    disconnect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
+    disconnect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int)));
     m_edit->setValue(value.toInt());
-    connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int)));
+    connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateProperty(int)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
diff --git a/lib/widgets/propeditor/pstringlistedit.cpp b/lib/widgets/propeditor/pstringlistedit.cpp
index b6f4b74e..9f2e1364 100644
--- a/lib/widgets/propeditor/pstringlistedit.cpp
+++ b/lib/widgets/propeditor/pstringlistedit.cpp
@@ -49,7 +49,7 @@ PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *parent, cons
     pbSelect->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
     l->addWidget(pbSelect);
 
-    connect(pbSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(showEditor()));
+    connect(pbSelect, TQ_SIGNAL(clicked()), this, TQ_SLOT(showEditor()));
 }
 
 TQVariant PStringListEdit::value() const
@@ -87,8 +87,8 @@ void PStringListEdit::showEditor()
 #endif
     TQSpacerItem *si = new TQSpacerItem(30, 0, TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 
-    connect(pbOk, TQT_SIGNAL(clicked()), dia, TQT_SLOT(accept()));
-    connect(pbCancel, TQT_SIGNAL(clicked()), dia, TQT_SLOT(reject()));
+    connect(pbOk, TQ_SIGNAL(clicked()), dia, TQ_SLOT(accept()));
+    connect(pbCancel, TQ_SIGNAL(clicked()), dia, TQ_SLOT(reject()));
 
     dh->addItem(si);
     dh->addWidget(pbOk);
diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp
index ee91ea48..7b7afec1 100644
--- a/lib/widgets/propeditor/psymbolcombo.cpp
+++ b/lib/widgets/propeditor/psymbolcombo.cpp
@@ -51,8 +51,8 @@ PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char
     m_select->hide();
 #endif
 
-    connect(m_select, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectChar()));
-    connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
+    connect(m_select, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectChar()));
+    connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&)));
 }
 
 TQVariant PSymbolCombo::value() const
@@ -67,9 +67,9 @@ void PSymbolCombo::setValue(const TQVariant &value, bool emitChange)
 {
     if (!(value.isNull()))
     {
-        disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
+        disconnect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&)));
         m_edit->setText(TQChar(value.toInt()));
-        connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
+        connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&)));
         if (emitChange)
             emit propertyChanged(m_property, value);
     }
@@ -89,8 +89,8 @@ void PSymbolCombo::selectChar()
     KPushButton *pbCancel = new KPushButton(KStdGuiItem::cancel(), dia);
     TQSpacerItem *si = new TQSpacerItem(30, 0, TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 
-    connect(pbOk, TQT_SIGNAL(clicked()), dia, TQT_SLOT(accept()));
-    connect(pbCancel, TQT_SIGNAL(clicked()), dia, TQT_SLOT(reject()));
+    connect(pbOk, TQ_SIGNAL(clicked()), dia, TQ_SLOT(accept()));
+    connect(pbCancel, TQ_SIGNAL(clicked()), dia, TQ_SLOT(reject()));
 
     dh->addItem(si);
     dh->addWidget(pbOk);
diff --git a/lib/widgets/propeditor/purledit.cpp b/lib/widgets/propeditor/purledit.cpp
index 047c9997..d2df31e0 100644
--- a/lib/widgets/propeditor/purledit.cpp
+++ b/lib/widgets/propeditor/purledit.cpp
@@ -38,14 +38,14 @@ PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent, const c
     m_edit = new KURLRequester(this);
     l->addWidget(m_edit);
     m_edit->setMode((KFile::Mode)mode);
-    connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
+    connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&)));
 #else
     m_edit = new KLineEdit(this);
     m_select = new TQPushButton("...",this);
     l->addWidget(m_edit);
     l->addWidget(m_select);
     m_mode = mode;
-    connect( m_select, TQT_SIGNAL(clicked()),this,TQT_SLOT(select()));
+    connect( m_select, TQ_SIGNAL(clicked()),this,TQ_SLOT(select()));
 #endif
     m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 }
@@ -62,9 +62,9 @@ TQVariant PUrlEdit::value() const
 void PUrlEdit::setValue(const TQVariant& value, bool emitChange)
 {
 #ifndef PURE_QT
-    disconnect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
+    disconnect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&)));
     m_edit->setURL(value.toString());
-    connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&)));
+    connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateProperty(const TQString&)));
 #else
     m_edit->setText(value.toString());
 #endif
diff --git a/lib/widgets/propeditor/pyesnobutton.cpp b/lib/widgets/propeditor/pyesnobutton.cpp
index dae82868..2d4bfb57 100644
--- a/lib/widgets/propeditor/pyesnobutton.cpp
+++ b/lib/widgets/propeditor/pyesnobutton.cpp
@@ -40,7 +40,7 @@ PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* parent, const char
     m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
 
-    connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool)));
+    connect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool)));
 }
 
 TQVariant PYesNoButton::value() const
@@ -55,10 +55,10 @@ void PYesNoButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect
 
 void PYesNoButton::setValue(const TQVariant& value, bool emitChange)
 {
-    disconnect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool)));
+    disconnect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool)));
     m_edit->setDown(value.toBool());
     value.toBool() ? m_edit->setText(i18n("Yes")) : m_edit->setText(i18n("No"));
-    connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool)));
+    connect(m_edit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateProperty(bool)));
     if (emitChange)
         emit propertyChanged(m_property, value);
 }
diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp
index 683a0931..862de024 100644
--- a/lib/widgets/propeditor/qeditlistbox.cpp
+++ b/lib/widgets/propeditor/qeditlistbox.cpp
@@ -120,7 +120,7 @@ void QEditListBox::init( bool checkAtEntering, int buttons,
     if ( buttons & Add ) {
         servNewButton = new TQPushButton(i18n("&Add"), gb);
         servNewButton->setEnabled(false);
-        connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addItem()));
+        connect(servNewButton, TQ_SIGNAL(clicked()), TQ_SLOT(addItem()));
 
         grid->addWidget(servNewButton, row++, 1);
     }
@@ -128,7 +128,7 @@ void QEditListBox::init( bool checkAtEntering, int buttons,
     if ( buttons & Remove ) {
         servRemoveButton = new TQPushButton(i18n("&Remove"), gb);
         servRemoveButton->setEnabled(false);
-        connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem()));
+        connect(servRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem()));
 
         grid->addWidget(servRemoveButton, row++, 1);
     }
@@ -136,20 +136,20 @@ void QEditListBox::init( bool checkAtEntering, int buttons,
     if ( buttons & UpDown ) {
         servUpButton = new TQPushButton(i18n("Move &Up"), gb);
         servUpButton->setEnabled(false);
-        connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemUp()));
+        connect(servUpButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemUp()));
 
         servDownButton = new TQPushButton(i18n("Move &Down"), gb);
         servDownButton->setEnabled(false);
-        connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemDown()));
+        connect(servDownButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemDown()));
 
         grid->addWidget(servUpButton, row++, 1);
         grid->addWidget(servDownButton, row++, 1);
     }
 
-    connect(m_lineEdit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(typedSomething(const TQString&)));
+    connect(m_lineEdit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(typedSomething(const TQString&)));
 
-    connect(m_lineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addItem()));
-    connect(m_listBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int)));
+    connect(m_lineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(addItem()));
+    connect(m_listBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableMoveButtons(int)));
 
     // maybe supplied lineedit has some text already
     typedSomething( m_lineEdit->text() );
diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp
index c54f425c..625e4d25 100644
--- a/lib/widgets/qcomboview.cpp
+++ b/lib/widgets/qcomboview.cpp
@@ -491,7 +491,7 @@ void QComboView::mousePressEvent( TQMouseEvent *e )
             d->arrowDown    = TRUE;
             repaint( FALSE );
         }
-        TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout()));
+        TQTimer::singleShot( 200, this, TQ_SLOT(internalClickTimeout()));
         d->shortClick = TRUE;
     }
 }
@@ -1241,16 +1241,16 @@ void QComboView::setListView( TQListView * newListView )
     d->listView()->resize( 100, 10 );
 */
 
-    connect( d->listView(), TQT_SIGNAL(returnPressed(TQListViewItem*)),
-            TQT_SLOT(internalActivate(TQListViewItem*)));
-    connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-            TQT_SLOT(internalActivate(TQListViewItem*)));
-    connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-            TQT_SLOT(checkState(TQListViewItem*)));
-    connect( d->listView(), TQT_SIGNAL(currentChanged(TQListViewItem*)),
-            TQT_SLOT(internalHighlight(TQListViewItem*)));
-    connect( d->listView(), TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-            TQT_SLOT(internalHighlight(TQListViewItem*)));
+    connect( d->listView(), TQ_SIGNAL(returnPressed(TQListViewItem*)),
+            TQ_SLOT(internalActivate(TQListViewItem*)));
+    connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+            TQ_SLOT(internalActivate(TQListViewItem*)));
+    connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+            TQ_SLOT(checkState(TQListViewItem*)));
+    connect( d->listView(), TQ_SIGNAL(currentChanged(TQListViewItem*)),
+            TQ_SLOT(internalHighlight(TQListViewItem*)));
+    connect( d->listView(), TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+            TQ_SLOT(internalHighlight(TQListViewItem*)));
 }
 
 
@@ -1386,16 +1386,16 @@ void QComboView::setUpListView()
 
     d->listView()->header()->hide();
 
-    connect( d->listView(), TQT_SIGNAL(returnPressed(TQListViewItem*)),
-            TQT_SLOT(internalActivate(TQListViewItem*)));
-    connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-            TQT_SLOT(internalActivate(TQListViewItem*)));
-    connect( d->listView(), TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-            TQT_SLOT(checkState(TQListViewItem*)));
-    connect( d->listView(), TQT_SIGNAL(currentChanged(TQListViewItem*)),
-            TQT_SLOT(internalHighlight(TQListViewItem*)));
-    connect( d->listView(), TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-            TQT_SLOT(internalHighlight(TQListViewItem*)));
+    connect( d->listView(), TQ_SIGNAL(returnPressed(TQListViewItem*)),
+            TQ_SLOT(internalActivate(TQListViewItem*)));
+    connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+            TQ_SLOT(internalActivate(TQListViewItem*)));
+    connect( d->listView(), TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+            TQ_SLOT(checkState(TQListViewItem*)));
+    connect( d->listView(), TQ_SIGNAL(currentChanged(TQListViewItem*)),
+            TQ_SLOT(internalHighlight(TQListViewItem*)));
+    connect( d->listView(), TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+            TQ_SLOT(internalHighlight(TQListViewItem*)));
 }
 
 
@@ -1435,9 +1435,9 @@ void QComboView::setLineEdit( TQLineEdit *edit )
         edit->setFont( font() );
     }
 
-    connect (edit, TQT_SIGNAL( textChanged( const TQString& ) ),
-            this, TQT_SIGNAL( textChanged( const TQString& ) ) );
-    connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) );
+    connect (edit, TQ_SIGNAL( textChanged( const TQString& ) ),
+            this, TQ_SIGNAL( textChanged( const TQString& ) ) );
+    connect( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) );
 
     edit->setFrame( FALSE );
     d->updateLinedGeometry();