diff options
Diffstat (limited to 'lib/widgets')
65 files changed, 281 insertions, 281 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/flagboxes.h b/lib/widgets/flagboxes.h index 79c77fa7..89de805a 100644 --- a/lib/widgets/flagboxes.h +++ b/lib/widgets/flagboxes.h @@ -67,7 +67,7 @@ private: /**List box item holding a compiler flag.*/ class FlagListBox : public TQListView { - Q_OBJECT + TQ_OBJECT public: FlagListBox( TQWidget *parent=0, const char *name=0 ); @@ -82,7 +82,7 @@ public: /**Check box item holding a compiler flag.*/ class FlagCheckBox : public TQCheckBox { - Q_OBJECT + TQ_OBJECT public: FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, @@ -109,7 +109,7 @@ private: /**Radiobutton item holding an option of a compiler flag.*/ class FlagRadioButton : public TQRadioButton { - Q_OBJECT + TQ_OBJECT public: FlagRadioButton(TQWidget *parent, FlagRadioButtonController *controller, @@ -125,7 +125,7 @@ private: /**Path editor if path is a compiler flag.*/ class FlagPathEdit: public TQWidget { - Q_OBJECT + TQ_OBJECT public: /**If the pathDelimiter is not empty then path edit can contain a list of paths*/ @@ -155,7 +155,7 @@ private: /**List editor if list is a compiler flag.*/ class FlagListEdit: public TQWidget { - Q_OBJECT + TQ_OBJECT public: /**If the listDelimiter is not empty then list edit can contain a list of entries*/ diff --git a/lib/widgets/kcomboview.h b/lib/widgets/kcomboview.h index f808c29c..2e52a216 100644 --- a/lib/widgets/kcomboview.h +++ b/lib/widgets/kcomboview.h @@ -54,7 +54,7 @@ class CustomCompleter : public TDECompletion { class KComboView: public QComboView { - Q_OBJECT + TQ_OBJECT public: ///The combo-view takes the ownership of the completer and deletes it on destruction diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index a8520e30..dca4ac56 100644 --- a/lib/widgets/kdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -5,7 +5,7 @@ #include <kxmlguiclient.h> #include <tdeaction.h> #include <kstdaction.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdepopupmenu.h> #include <kiconloader.h> @@ -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/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h index 6c8f7dc3..080c66ca 100644 --- a/lib/widgets/kdevhtmlpart.h +++ b/lib/widgets/kdevhtmlpart.h @@ -43,7 +43,7 @@ It has it's own popup menu and font/zoom settings. */ class KDevHTMLPart : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp index cadff807..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() @@ -50,7 +50,7 @@ void KTabBar::closeOthersSlot() void KTabBar::mousePressEvent(TQMouseEvent *e) { - if(e->button() == Qt::RightButton) { + if(e->button() == TQt::RightButton) { TQTab *tab = selectTab(e->pos() ); if( tab == 0L ) return; 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/ksavealldialog.h b/lib/widgets/ksavealldialog.h index fcd63fc0..59a16f87 100644 --- a/lib/widgets/ksavealldialog.h +++ b/lib/widgets/ksavealldialog.h @@ -35,7 +35,7 @@ Dialog to save selected files. */ class KSaveSelectDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -61,7 +61,7 @@ Dialog to save all files. */ class KSaveAllDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/widgets/processlinemaker.cpp b/lib/widgets/processlinemaker.cpp index 113b206b..40ddf6c1 100644 --- a/lib/widgets/processlinemaker.cpp +++ b/lib/widgets/processlinemaker.cpp @@ -20,7 +20,7 @@ #include "processlinemaker.h" #include "processlinemaker.moc" -#include <kprocess.h> +#include <tdeprocess.h> ProcessLineMaker::ProcessLineMaker() { @@ -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/processlinemaker.h b/lib/widgets/processlinemaker.h index 7126b322..c438e84e 100644 --- a/lib/widgets/processlinemaker.h +++ b/lib/widgets/processlinemaker.h @@ -34,7 +34,7 @@ Convenience class to catch output of TDEProcess. */ class ProcessLineMaker : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp index a4188643..8e32c5df 100644 --- a/lib/widgets/processwidget.cpp +++ b/lib/widgets/processwidget.cpp @@ -24,7 +24,7 @@ #include <tqdir.h> #include <kdebug.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqpainter.h> #include <tqapplication.h> @@ -106,7 +106,7 @@ void ProcessListBoxItem::paint(TQPainter *p) ProcessWidget::ProcessWidget(TQWidget *parent, const char *name) : TDEListBox(parent, name) { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); // Don't override the palette, as that can mess up styles. Instead, draw // the background ourselves (see ProcessListBoxItem::paint). @@ -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/processwidget.h b/lib/widgets/processwidget.h index a8279477..d1c7676a 100644 --- a/lib/widgets/processwidget.h +++ b/lib/widgets/processwidget.h @@ -21,7 +21,7 @@ #define _PROCESSWIDGET_H_ #include <tdelistbox.h> -#include <kprocess.h> +#include <tdeprocess.h> /** @file processwidget.h @@ -57,7 +57,7 @@ private: */ class ProcessWidget : public TDEListBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/widgets/propeditor/Mainpage.dox b/lib/widgets/propeditor/Mainpage.dox index d77010d0..411a2ffe 100644 --- a/lib/widgets/propeditor/Mainpage.dox +++ b/lib/widgets/propeditor/Mainpage.dox @@ -76,7 +76,7 @@ A simple example on how to create a property editor and use it with one property list->addProperty("My Group", new Property(Property::String, "Second Property", "This is my second property", "Hello")); list->addProperty(new Property(Property::Color, "Third Property", - "This is my third property", QColor("green"))); + "This is my third property", TQColor("green"))); m_editor->populateProperties(*list); \endcode @@ -94,7 +94,7 @@ More advanced example with property buffers and list intersection: list->addProperty("My Group", new Property(Property::String, "Second Property", "This is my second property", "Hello")); list->addProperty(new Property(Property::Color, "Third Property", - "This is my third property", QColor("green"))); + "This is my third property", TQColor("green"))); PropertyList *list2 = new PropertyList; list2->addProperty("My Group", new Property(Property::Integer, "First Property", 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/pcheckbox.h b/lib/widgets/propeditor/pcheckbox.h index ed2aea39..0131cf82 100644 --- a/lib/widgets/propeditor/pcheckbox.h +++ b/lib/widgets/propeditor/pcheckbox.h @@ -30,7 +30,7 @@ namespace PropertyLib{ @short %Property editor with checkbox. */ class PCheckBox: public PropertyWidget{ - Q_OBJECT + TQ_OBJECT public: PCheckBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); 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/pcolorbutton.h b/lib/widgets/propeditor/pcolorbutton.h index ab17b449..61f96fc4 100644 --- a/lib/widgets/propeditor/pcolorbutton.h +++ b/lib/widgets/propeditor/pcolorbutton.h @@ -35,7 +35,7 @@ namespace PropertyLib{ */ class PColorButton: public PropertyWidget { - Q_OBJECT + TQ_OBJECT public: PColorButton(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); 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/pcolorcombo.h b/lib/widgets/propeditor/pcolorcombo.h index 052c287d..31588b7d 100644 --- a/lib/widgets/propeditor/pcolorcombo.h +++ b/lib/widgets/propeditor/pcolorcombo.h @@ -30,7 +30,7 @@ namespace PropertyLib{ @short %Property editor with color combobox. */ class PColorCombo: public PropertyWidget{ - Q_OBJECT + TQ_OBJECT public: PColorCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); 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/pcombobox.h b/lib/widgets/propeditor/pcombobox.h index c9da1ad9..fc246ea5 100644 --- a/lib/widgets/propeditor/pcombobox.h +++ b/lib/widgets/propeditor/pcombobox.h @@ -34,7 +34,7 @@ namespace PropertyLib{ @short %Property editor with combobox. */ class PComboBox: public PropertyWidget{ - Q_OBJECT + TQ_OBJECT public: /**This constructor is used for read-only selection combo. It provides a value from valueList*/ diff --git a/lib/widgets/propeditor/pcursoredit.h b/lib/widgets/propeditor/pcursoredit.h index 5ff9fbf3..9ff8320f 100644 --- a/lib/widgets/propeditor/pcursoredit.h +++ b/lib/widgets/propeditor/pcursoredit.h @@ -29,7 +29,7 @@ namespace PropertyLib{ */ class PCursorEdit: public PComboBox { - Q_OBJECT + TQ_OBJECT public: PCursorEdit(MultiProperty* property, const TQStringVariantMap &spValues, diff --git a/lib/widgets/propeditor/pdateedit.cpp b/lib/widgets/propeditor/pdateedit.cpp index ed83dbb2..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 @@ -46,14 +46,14 @@ void PDateEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toDate().toString(Qt::LocalDate)); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toDate().toString(TQt::LocalDate)); } 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/pdateedit.h b/lib/widgets/propeditor/pdateedit.h index 126a4023..edfe69ff 100644 --- a/lib/widgets/propeditor/pdateedit.h +++ b/lib/widgets/propeditor/pdateedit.h @@ -31,7 +31,7 @@ namespace PropertyLib{ */ class PDateEdit : public PropertyWidget { -Q_OBJECT +TQ_OBJECT public: PDateEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); diff --git a/lib/widgets/propeditor/pdatetimeedit.cpp b/lib/widgets/propeditor/pdatetimeedit.cpp index 3b8993d3..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 @@ -45,14 +45,14 @@ void PDateTimeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRec p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toDateTime().toString(Qt::LocalDate)); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toDateTime().toString(TQt::LocalDate)); } 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/pdatetimeedit.h b/lib/widgets/propeditor/pdatetimeedit.h index 4b54714b..86affb59 100644 --- a/lib/widgets/propeditor/pdatetimeedit.h +++ b/lib/widgets/propeditor/pdatetimeedit.h @@ -31,7 +31,7 @@ namespace PropertyLib{ */ class PDateTimeEdit : public PropertyWidget { -Q_OBJECT +TQ_OBJECT public: PDateTimeEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); 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/pdoublenuminput.h b/lib/widgets/propeditor/pdoublenuminput.h index a398c498..65665ddc 100644 --- a/lib/widgets/propeditor/pdoublenuminput.h +++ b/lib/widgets/propeditor/pdoublenuminput.h @@ -35,7 +35,7 @@ namespace PropertyLib{ */ class PDoubleNumInput: public PropertyWidget { -Q_OBJECT +TQ_OBJECT public: PDoubleNumInput(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/pdummywidget.h b/lib/widgets/propeditor/pdummywidget.h index dad94591..514af868 100644 --- a/lib/widgets/propeditor/pdummywidget.h +++ b/lib/widgets/propeditor/pdummywidget.h @@ -39,7 +39,7 @@ like TQValueList's or TQMap's stored in a variant. */ class PDummyWidget: public PropertyWidget { - Q_OBJECT + TQ_OBJECT public: PDummyWidget(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); 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/pfontbutton.h b/lib/widgets/propeditor/pfontbutton.h index 3f7d54c6..818b5779 100644 --- a/lib/widgets/propeditor/pfontbutton.h +++ b/lib/widgets/propeditor/pfontbutton.h @@ -31,7 +31,7 @@ namespace PropertyLib{ */ class PFontButton : public PropertyWidget { -Q_OBJECT +TQ_OBJECT public: PFontButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); 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/pfontcombo.h b/lib/widgets/propeditor/pfontcombo.h index e1a90b69..f208e18a 100644 --- a/lib/widgets/propeditor/pfontcombo.h +++ b/lib/widgets/propeditor/pfontcombo.h @@ -34,7 +34,7 @@ namespace PropertyLib{ @short %Property editor with font combo box. */ class PFontCombo: public PropertyWidget{ - Q_OBJECT + TQ_OBJECT public: PFontCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); 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/plineedit.h b/lib/widgets/propeditor/plineedit.h index 4730a5c7..a5d57b98 100644 --- a/lib/widgets/propeditor/plineedit.h +++ b/lib/widgets/propeditor/plineedit.h @@ -30,7 +30,7 @@ namespace PropertyLib{ @short %Property editor with line edit. */ class PLineEdit: public PropertyWidget{ - Q_OBJECT + TQ_OBJECT public: PLineEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); 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/plinestyleedit.h b/lib/widgets/propeditor/plinestyleedit.h index 2df5f3be..2c91e04a 100644 --- a/lib/widgets/propeditor/plinestyleedit.h +++ b/lib/widgets/propeditor/plinestyleedit.h @@ -30,7 +30,7 @@ namespace PropertyLib { @short Line style editor */ class PLineStyleEdit : public PropertyWidget { - Q_OBJECT + TQ_OBJECT public: PLineStyleEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp index 452b9637..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 @@ -112,7 +112,7 @@ void PPixmapEdit::resizeEvent(TQResizeEvent *ev) bool PPixmapEdit::eventFilter(TQObject *o, TQEvent *ev) { - if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_edit)) + if(o == m_edit) { if(ev->type() == TQEvent::MouseButtonPress) { @@ -131,7 +131,7 @@ bool PPixmapEdit::eventFilter(TQObject *o, TQEvent *ev) } if(ev->type() == TQEvent::KeyPress) { - TQKeyEvent* e = TQT_TQKEYEVENT(ev); + TQKeyEvent* e = static_cast<TQKeyEvent*>(ev); if((e->key() == Key_Enter) || (e->key()== Key_Space) || (e->key() == Key_Return)) { m_button->animateClick(); diff --git a/lib/widgets/propeditor/ppixmapedit.h b/lib/widgets/propeditor/ppixmapedit.h index 1d95b6b5..5fdfebed 100644 --- a/lib/widgets/propeditor/ppixmapedit.h +++ b/lib/widgets/propeditor/ppixmapedit.h @@ -32,7 +32,7 @@ namespace PropertyLib{ */ class PPixmapEdit : public PropertyWidget { - Q_OBJECT + TQ_OBJECT public: PPixmapEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); diff --git a/lib/widgets/propeditor/ppointedit.h b/lib/widgets/propeditor/ppointedit.h index b6f9f9ad..8ed1e7ae 100644 --- a/lib/widgets/propeditor/ppointedit.h +++ b/lib/widgets/propeditor/ppointedit.h @@ -31,7 +31,7 @@ namespace PropertyLib{ */ class PPointEdit : public PropertyWidget { -Q_OBJECT +TQ_OBJECT public: PPointEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); diff --git a/lib/widgets/propeditor/prectedit.h b/lib/widgets/propeditor/prectedit.h index 82abcda1..cd360ad0 100644 --- a/lib/widgets/propeditor/prectedit.h +++ b/lib/widgets/propeditor/prectedit.h @@ -31,7 +31,7 @@ namespace PropertyLib{ */ class PRectEdit : public PropertyWidget { - Q_OBJECT + TQ_OBJECT public: PRectEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); 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/propertyeditor.h b/lib/widgets/propeditor/propertyeditor.h index 852d795a..ad5d722c 100644 --- a/lib/widgets/propeditor/propertyeditor.h +++ b/lib/widgets/propeditor/propertyeditor.h @@ -56,7 +56,7 @@ creation of property widgets from the machine factory. @see PropertyMachineFactory */ class PropertyEditor: public TDEListView{ - Q_OBJECT + TQ_OBJECT public: /**Constructs the property editor.*/ 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/propertylist.h b/lib/widgets/propeditor/propertylist.h index 9cee76f8..1561b04d 100644 --- a/lib/widgets/propeditor/propertylist.h +++ b/lib/widgets/propeditor/propertylist.h @@ -54,7 +54,7 @@ alphabetically sorted list of properties or both at the same time. */ class PropertyList: public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -181,7 +181,7 @@ buf->intersect(list3); /endcode */ class PropertyBuffer: public PropertyList{ - Q_OBJECT + TQ_OBJECT public: /**Constructs a buffer from given property list.*/ diff --git a/lib/widgets/propeditor/propertywidget.h b/lib/widgets/propeditor/propertywidget.h index 5071190b..857805da 100644 --- a/lib/widgets/propeditor/propertywidget.h +++ b/lib/widgets/propeditor/propertywidget.h @@ -47,7 +47,7 @@ A set of predefined widgets for predefined property types are available in the library. */ class PropertyWidget: public TQWidget{ - Q_OBJECT + TQ_OBJECT public: /**Constructs widget for property with name "propertyName".*/ diff --git a/lib/widgets/propeditor/propertywidgetproxy.h b/lib/widgets/propeditor/propertywidgetproxy.h index 37bbadb8..fdbcfffb 100644 --- a/lib/widgets/propeditor/propertywidgetproxy.h +++ b/lib/widgets/propeditor/propertywidgetproxy.h @@ -41,7 +41,7 @@ depending on the property type. */ class PropertyWidgetProxy: public TQWidget { -Q_OBJECT +TQ_OBJECT TQ_PROPERTY( int propertyType READ propertyType WRITE setPropertyType DESIGNABLE true ) TQ_PROPERTY( PropertyType propertyType2 READ propertyType2 WRITE setPropertyType2 DESIGNABLE false ) diff --git a/lib/widgets/propeditor/psizeedit.h b/lib/widgets/propeditor/psizeedit.h index 34acbb41..c4dba926 100644 --- a/lib/widgets/propeditor/psizeedit.h +++ b/lib/widgets/propeditor/psizeedit.h @@ -33,7 +33,7 @@ namespace PropertyLib{ */ class PSizeEdit: public PropertyWidget { - Q_OBJECT + TQ_OBJECT public: PSizeEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/psizepolicyedit.h b/lib/widgets/propeditor/psizepolicyedit.h index 45ad5414..eb30bd64 100644 --- a/lib/widgets/propeditor/psizepolicyedit.h +++ b/lib/widgets/propeditor/psizepolicyedit.h @@ -33,7 +33,7 @@ namespace PropertyLib{ */ class PSizePolicyEdit : public PropertyWidget { -Q_OBJECT +TQ_OBJECT public: PSizePolicyEdit(MultiProperty* property, const TQStringVariantMap &spValues, TQWidget* parent=0, const char* name=0); 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/pspinbox.h b/lib/widgets/propeditor/pspinbox.h index ecb73907..11e184ff 100644 --- a/lib/widgets/propeditor/pspinbox.h +++ b/lib/widgets/propeditor/pspinbox.h @@ -30,7 +30,7 @@ namespace PropertyLib{ @short %Property editor with integer num input box. */ class PSpinBox: public PropertyWidget{ - Q_OBJECT + TQ_OBJECT public: PSpinBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); 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/pstringlistedit.h b/lib/widgets/propeditor/pstringlistedit.h index 85b2ecc7..9986010d 100644 --- a/lib/widgets/propeditor/pstringlistedit.h +++ b/lib/widgets/propeditor/pstringlistedit.h @@ -34,7 +34,7 @@ namespace PropertyLib{ */ class PStringListEdit: public PropertyWidget { - Q_OBJECT + TQ_OBJECT public: PStringListEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); 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/psymbolcombo.h b/lib/widgets/propeditor/psymbolcombo.h index 52750fa1..c55eba58 100644 --- a/lib/widgets/propeditor/psymbolcombo.h +++ b/lib/widgets/propeditor/psymbolcombo.h @@ -33,7 +33,7 @@ namespace PropertyLib{ @short %Property editor with char selector. */ class PSymbolCombo: public PropertyWidget{ - Q_OBJECT + TQ_OBJECT public: PSymbolCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); 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/purledit.h b/lib/widgets/propeditor/purledit.h index bed86853..027f3b7d 100644 --- a/lib/widgets/propeditor/purledit.h +++ b/lib/widgets/propeditor/purledit.h @@ -38,7 +38,7 @@ namespace PropertyLib{ */ class PUrlEdit : public PropertyWidget { -Q_OBJECT +TQ_OBJECT public: #ifndef PURE_QT 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/pyesnobutton.h b/lib/widgets/propeditor/pyesnobutton.h index bb899186..4e41da47 100644 --- a/lib/widgets/propeditor/pyesnobutton.h +++ b/lib/widgets/propeditor/pyesnobutton.h @@ -31,7 +31,7 @@ namespace PropertyLib{ */ class PYesNoButton : public PropertyWidget { - Q_OBJECT + TQ_OBJECT public: PYesNoButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); 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/propeditor/qeditlistbox.h b/lib/widgets/propeditor/qeditlistbox.h index b57c454e..91ef4c3c 100644 --- a/lib/widgets/propeditor/qeditlistbox.h +++ b/lib/widgets/propeditor/qeditlistbox.h @@ -44,7 +44,7 @@ class QEditListBoxPrivate; class QEditListBox : public TQGroupBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQStringList items READ items WRITE setItems ) diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp index cb44f32c..1f5c6aa3 100644 --- a/lib/widgets/qcomboview.cpp +++ b/lib/widgets/qcomboview.cpp @@ -26,7 +26,7 @@ #include "tqapplication.h" #include "tqlineedit.h" #include "tqbitmap.h" -#include "tqeffects_p.h" +#include "private/tqeffects_p.h" #include "tqstringlist.h" #include "tqcombobox.h" #include "tqstyle.h" @@ -38,7 +38,7 @@ class QComboViewData public: QComboViewData( QComboView *cb ): current(0), lView( 0 ), combo( cb ) { - duplicatesEnabled = TRUE; + duplicatesEnabled = true; cb->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); } @@ -46,7 +46,7 @@ public: void updateLinedGeometry(); void setListView( TQListView *l ) { lView = l ; - l->setMouseTracking( TRUE );} + l->setMouseTracking( true );} TQListViewItem *current; int maxCount; @@ -130,7 +130,7 @@ static inline bool checkIndex( const char *method, const char * name, Constructs a combobox with a maximum size and either Motif 2.0 or Windows look and feel. - The input field can be edited if \a rw is TRUE, otherwise the user + The input field can be edited if \a rw is true, otherwise the user may only choose one of the items in the combobox. The \a parent and \a name arguments are passed on to the TQWidget @@ -148,17 +148,17 @@ QComboView::QComboView( bool rw, TQWidget *parent, const char *name ) d->maxCount = INT_MAX; setSizeLimit(10); d->p = AtBottom; - d->autoresize = FALSE; - d->poppedUp = FALSE; - d->arrowDown = FALSE; - d->discardNextMousePress = FALSE; - d->shortClick = FALSE; - d->useCompletion = FALSE; + d->autoresize = false; + d->poppedUp = false; + d->arrowDown = false; + d->discardNextMousePress = false; + d->shortClick = false; + d->useCompletion = false; d->completeAt = 0; - d->completeNow = FALSE; + d->completeNow = false; d->completionTimer = new TQTimer( this ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); d->ed = 0; if ( rw ) @@ -290,7 +290,7 @@ TQSize QComboView::sizeHint() const maxW = w; } */ - d->sizeHint = (style().tqsizeFromContents(TQStyle::CT_ComboBox, this, + d->sizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, this, TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut())); return d->sizeHint; @@ -315,7 +315,7 @@ void QComboView::internalActivate( TQListViewItem * item ) return; } popDownListView(); - d->poppedUp = FALSE; + d->poppedUp = false; d->current = item; @@ -361,7 +361,7 @@ void QComboView::internalHighlight( TQListViewItem * item ) */ void QComboView::internalClickTimeout() { - d->shortClick = FALSE; + d->shortClick = false; } /*! @@ -422,7 +422,7 @@ void QComboView::paintEvent( TQPaintEvent * ) flags |= TQStyle::Style_HasFocus; if ( width() < 5 || height() < 5 ) { - qDrawShadePanel( &p, rect(), g, FALSE, 2, + qDrawShadePanel( &p, rect(), g, false, 2, &g.brush( TQColorGroup::Button ) ); return; } @@ -457,7 +457,7 @@ void QComboView::paintEvent( TQPaintEvent * ) ( re.height() - pix->height() ) / 2, *pix ); } } - p.setClipping( FALSE ); + p.setClipping( false ); } @@ -466,10 +466,10 @@ void QComboView::paintEvent( TQPaintEvent * ) void QComboView::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; if ( d->discardNextMousePress ) { - d->discardNextMousePress = FALSE; + d->discardNextMousePress = false; return; } TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, @@ -481,18 +481,18 @@ void QComboView::mousePressEvent( TQMouseEvent *e ) arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); if ( childCount() && ( !editable() || arrowRect.contains( e->pos() ) ) ) { - d->arrowPressed = FALSE; - listView()->blockSignals( TRUE ); + d->arrowPressed = false; + listView()->blockSignals( true ); tqApp->sendEvent( listView(), e ); // trigger the listbox's autoscroll - listView()->blockSignals( FALSE ); + listView()->blockSignals( false ); popup(); if ( arrowRect.contains( e->pos() ) ) { - d->arrowPressed = TRUE; - d->arrowDown = TRUE; - repaint( FALSE ); + d->arrowPressed = true; + d->arrowDown = true; + repaint( false ); } - TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout())); - d->shortClick = TRUE; + TQTimer::singleShot( 200, this, TQ_SLOT(internalClickTimeout())); + d->shortClick = true; } } @@ -585,7 +585,7 @@ void QComboView::keyPressEvent( TQKeyEvent *e ) else return; } - d->completionTimer->start( 400, TRUE ); + d->completionTimer->start( 400, true ); } else { e->ignore(); return; @@ -613,7 +613,7 @@ TQString QComboView::currentText() const void QComboView::focusInEvent( TQFocusEvent * e ) { TQWidget::focusInEvent( e ); - d->completeNow = FALSE; + d->completeNow = false; d->completeAt = 0; emit focusGranted(); @@ -625,7 +625,7 @@ void QComboView::focusInEvent( TQFocusEvent * e ) void QComboView::focusOutEvent( TQFocusEvent * e ) { TQWidget::focusOutEvent( e ); - d->completeNow = FALSE; + d->completeNow = false; d->completeAt = 0; emit focusLost(); @@ -726,7 +726,7 @@ void QComboView::popup() lb->triggerUpdate( ); lb->installEventFilter( this ); lb->viewport()->installEventFilter( this ); - d->mouseWasInsidePopup = FALSE; + d->mouseWasInsidePopup = false; // int w = lb->variableWidth() ? lb->sizeHint().width() : width(); int w = width(); int h = listHeight( lb, d->sizeLimit ); @@ -758,12 +758,12 @@ void QComboView::popup() lb->raise(); bool block = lb->signalsBlocked(); - lb->blockSignals( TRUE ); + lb->blockSignals( true ); TQListViewItem *currentLBItem = d->current ; lb->setCurrentItem( currentLBItem ); // set the current item to also be the selected item if it isn't already if ( currentLBItem && currentLBItem->isSelectable() && !currentLBItem->isSelected() ) - lb->setSelected( currentLBItem, TRUE ); + lb->setSelected( currentLBItem, true ); lb->blockSignals( block ); lb->setVScrollBarMode(TQScrollView::Auto); @@ -776,7 +776,7 @@ void QComboView::popup() } else*/ //#endif lb->show(); - d->poppedUp = TRUE; + d->poppedUp = true; } @@ -807,10 +807,10 @@ void QComboView::popDownListView() d->listView()->hide(); d->listView()->setCurrentItem( d->current ); if ( d->arrowDown ) { - d->arrowDown = FALSE; - repaint( FALSE ); + d->arrowDown = false; + repaint( false ); } - d->poppedUp = FALSE; + d->poppedUp = false; } @@ -849,16 +849,16 @@ void QComboView::currentChanged() bool QComboView::eventFilter( TQObject *object, TQEvent *event ) { if ( !event ) - return TRUE; - else if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(d->ed) ) { + return true; + else if ( object == d->ed ) { if ( event->type() == TQEvent::KeyPress ) { bool isAccepted = ( (TQKeyEvent*)event )->isAccepted(); keyPressEvent( (TQKeyEvent *)event ); if ( ((TQKeyEvent *)event)->isAccepted() ) { - d->completeNow = FALSE; - return TRUE; + d->completeNow = false; + return true; } else if ( ((TQKeyEvent *)event)->key() != Key_End ) { - d->completeNow = TRUE; + d->completeNow = true; d->completeAt = d->ed->cursorPosition(); } if ( isAccepted ) @@ -866,7 +866,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) else ( (TQKeyEvent*)event )->ignore(); } else if ( event->type() == TQEvent::KeyRelease ) { - d->completeNow = FALSE; + d->completeNow = false; keyReleaseEvent( (TQKeyEvent *)event ); return ((TQKeyEvent *)event)->isAccepted(); } else if ( event->type() == TQEvent::FocusIn ) { @@ -877,7 +877,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) if ( !d->ed->text().isNull() && d->ed->cursorPosition() > d->completeAt && d->ed->cursorPosition() == (int)d->ed->text().length() ) { - d->completeNow = FALSE; + d->completeNow = false; TQString ct( d->ed->text() ); TQListViewItem *i = completionIndex( ct, currentItem() ); if ( i ) { @@ -887,16 +887,16 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) } } } - } else if ( ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(d->listView()) || - TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(d->listView()->viewport()) )) { + } else if ( ( object == d->listView() || + object == d->listView()->viewport() )) { TQMouseEvent *e = (TQMouseEvent*)event; switch( event->type() ) { case TQEvent::MouseMove: if ( !d->mouseWasInsidePopup ) { // tqWarning("!d->mouseWasInsidePopup"); TQPoint pos = e->pos(); - if ( TQT_TQRECT_OBJECT(d->listView()->rect()).contains( pos ) ) - d->mouseWasInsidePopup = TRUE; + if ( d->listView()->rect().contains( pos ) ) + d->mouseWasInsidePopup = true; // Check if arrow button should toggle if ( d->arrowPressed ) { TQPoint comboPos; @@ -907,20 +907,20 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) arrowRect = TQStyle::visualRect(arrowRect, this); if ( arrowRect.contains( comboPos ) ) { if ( !d->arrowDown ) { - d->arrowDown = TRUE; - repaint( FALSE ); + d->arrowDown = true; + repaint( false ); } } else { if ( d->arrowDown ) { - d->arrowDown = FALSE; - repaint( FALSE ); + d->arrowDown = false; + repaint( false ); } } } - } else if ((e->state() & ( Qt::RightButton | Qt::LeftButton | Qt::MidButton ) ) == 0 && + } else if ((e->state() & ( TQt::RightButton | TQt::LeftButton | TQt::MidButton ) ) == 0 && style().styleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) { // tqWarning("event filter:: emu"); - TQWidget *mouseW = TQApplication::widgetAt( e->globalPos(), TRUE ); + TQWidget *mouseW = TQApplication::widgetAt( e->globalPos(), true ); // if ( mouseW == d->listView()->viewport() ) { //### if ( mouseW == d->listView()->viewport() ) { TQListViewItem *sel = d->listView()->itemAt(e->pos()); @@ -929,40 +929,40 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) d->listView()->setCurrentItem(sel); d->listView()->setSelected(sel, true); } - return TRUE; + return true; } } break; case TQEvent::MouseButtonRelease: - if ( TQT_TQRECT_OBJECT(d->listView()->rect()).contains( e->pos() ) ) { + if ( d->listView()->rect().contains( e->pos() ) ) { TQMouseEvent tmp( TQEvent::MouseButtonDblClick, e->pos(), e->button(), e->state() ) ; // will hide popup TQApplication::sendEvent( object, &tmp ); - return TRUE; + return true; } else { if ( d->mouseWasInsidePopup ) { popDownListView(); } else { - d->arrowPressed = FALSE; + d->arrowPressed = false; if ( d->arrowDown ) { - d->arrowDown = FALSE; - repaint( FALSE ); + d->arrowDown = false; + repaint( false ); } } } break; case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: - if ( !TQT_TQRECT_OBJECT(d->listView()->rect()).contains( e->pos() ) ) { + if ( !d->listView()->rect().contains( e->pos() ) ) { TQPoint globalPos = d->listView()->mapToGlobal(e->pos()); - if ( TQApplication::widgetAt( globalPos, TRUE ) == this ) { - d->discardNextMousePress = TRUE; + if ( TQApplication::widgetAt( globalPos, true ) == this ) { + d->discardNextMousePress = true; // avoid popping up again } popDownListView(); - return TRUE; + return true; } break; case TQEvent::KeyPress: @@ -975,13 +975,13 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) case Key_Escape: if ( d->poppedUp ) { popDownListView(); - return TRUE; + return true; } break; case Key_Enter: case Key_Return: // work around TQDialog's enter handling - return FALSE; + return false; default: break; } @@ -1083,11 +1083,11 @@ void QComboView::returnPressed() return; TQListViewItem *c = 0; - bool doInsert = TRUE; + bool doInsert = true; if ( !d->duplicatesEnabled ) { c = listView()->findItem(s, 0); if ( c ) - doInsert = FALSE; + doInsert = false; } if ( doInsert ) { @@ -1211,7 +1211,7 @@ void QComboView::setListView( TQListView * newListView ) delete d->listView(); - newListView->reparent( this, WType_Popup, TQPoint(0,0), FALSE ); + newListView->reparent( this, WType_Popup, TQPoint(0,0), false ); d->setListView( newListView ); d->listView()->setFont( font() ); d->listView()->setPalette( palette() ); @@ -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*))); } @@ -1320,7 +1320,7 @@ void QComboView::setEditText( const TQString &newText ) void QComboView::setAutoCompletion( bool enable ) { d->useCompletion = enable; - d->completeNow = FALSE; + d->completeNow = false; } @@ -1359,7 +1359,7 @@ void QComboView::setEditable( bool y ) d->ed = 0; } - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); updateGeometry(); update(); } @@ -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*))); } @@ -1430,20 +1430,20 @@ void QComboView::setLineEdit( TQLineEdit *edit ) d->ed = edit; - if ( TQT_BASE_OBJECT(edit->parent()) != TQT_BASE_OBJECT(this) ) { - edit->reparent( this, TQPoint(0,0), FALSE ); + if ( edit->parent() != this ) { + edit->reparent( this, TQPoint(0,0), false ); 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 ); + edit->setFrame( false ); d->updateLinedGeometry(); edit->installEventFilter( this ); setFocusProxy( edit ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setUpListView(); diff --git a/lib/widgets/qcomboview.h b/lib/widgets/qcomboview.h index 51d57eec..cff2ce68 100644 --- a/lib/widgets/qcomboview.h +++ b/lib/widgets/qcomboview.h @@ -40,7 +40,7 @@ in the same way as TQComboBox and have similar API. */ class TQ_EXPORT QComboView : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( Policy ) TQ_PROPERTY( bool editable READ editable WRITE setEditable ) diff --git a/lib/widgets/resizablecombo.cpp b/lib/widgets/resizablecombo.cpp index ef96e724..c1dd08a3 100644 --- a/lib/widgets/resizablecombo.cpp +++ b/lib/widgets/resizablecombo.cpp @@ -89,7 +89,7 @@ void MyPushButton::mouseMoveEvent( TQMouseEvent * e ) MyPushButton::MyPushButton( ResizableCombo * parent, const char * name ) :TQPushButton(parent, name), m_resizing(false), m_combo(parent) { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setFlat(true); m_width = m_combo->m_combo->width(); } diff --git a/lib/widgets/resizablecombo.h b/lib/widgets/resizablecombo.h index 4852f3dc..1bb629a3 100644 --- a/lib/widgets/resizablecombo.h +++ b/lib/widgets/resizablecombo.h @@ -36,7 +36,7 @@ Resizable combo box. Used to place resizable KComboBox onto toolbars. */ class ResizableCombo: public TQWidget{ - Q_OBJECT + TQ_OBJECT public: ResizableCombo(KComboView *view, TQWidget *parent = 0, const char *name = 0); |