diff options
Diffstat (limited to 'kommander/widgets')
68 files changed, 209 insertions, 157 deletions
diff --git a/kommander/widgets/CMakeLists.txt b/kommander/widgets/CMakeLists.txt new file mode 100644 index 00000000..a3e2d641 --- /dev/null +++ b/kommander/widgets/CMakeLists.txt @@ -0,0 +1,52 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/widget + ${CMAKE_SOURCE_DIR}/kommander/factory + ${CMAKE_SOURCE_DIR}/kommander/plugin +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kommanderwidgets (shared) + +tde_add_library( kommanderwidgets SHARED AUTOMOC + + SOURCES + aboutdialog.cpp buttongroup.cpp + checkbox.cpp closebutton.cpp + combobox.cpp datepicker.cpp dialog.cpp + execbutton.cpp fileselector.cpp + fontdialog.cpp groupbox.cpp + konsole.cpp label.cpp + lineedit.cpp listbox.cpp + pixmaplabel.cpp plugin.cpp + popupmenu.cpp progressbar.cpp + radiobutton.cpp richtexteditor.cpp + scriptobject.cpp slider.cpp + spinboxint.cpp statusbar.cpp + subdialog.cpp table.cpp + tabwidget.cpp textbrowser.cpp + textedit.cpp timer.cpp + toolbox.cpp treewidget.cpp + wizard.cpp + LINK + tdeio-shared + kommanderwidget-shared + kommanderplugin-shared + kommanderfactory-static + + DESTINATION ${LIB_INSTALL_DIR} + + VERSION 0.0.0 +) diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp index a9a8f77f..1ed4888e 100644 --- a/kommander/widgets/aboutdialog.cpp +++ b/kommander/widgets/aboutdialog.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqfile.h> #include "aboutdialog.h" @@ -37,7 +42,7 @@ enum Functions { }; AboutDialog::AboutDialog(TQWidget *parent, const char *name) - : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(parent, name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -119,8 +124,8 @@ void AboutDialog::initialize(const TQString& appName, const TQString &icon, cons m_appName = appName; m_icon = icon; m_copyright = copyright; - m_aboutData = new TDEAboutData(m_appName, m_appName, m_version); - m_aboutData->setCopyrightStatement(m_copyright); + m_aboutData = new TDEAboutData(m_appName.utf8(), m_appName.utf8(), m_version.utf8()); + m_aboutData->setCopyrightStatement(m_copyright.utf8()); if (!m_icon.isEmpty()) m_aboutData->setProgramLogo(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeMedium).convertToImage()); } @@ -133,7 +138,7 @@ void AboutDialog::addAuthor(const TQString& author, const TQString &task, const m_emails.append(email); m_tasks.append(task); m_addresses.append(webAddress); - m_aboutData->addAuthor(author, task, email, webAddress); + m_aboutData->addAuthor(author.utf8(), task.utf8(), email.utf8(), webAddress.utf8()); } void AboutDialog::addTranslator(const TQString& author, const TQString& email) @@ -142,7 +147,7 @@ void AboutDialog::addTranslator(const TQString& author, const TQString& email) return; m_authors.append(author); m_emails.append(email); - m_aboutData->setTranslator(author, email); + m_aboutData->setTranslator(author.utf8(), email.utf8()); } void AboutDialog::setDescription(const TQString& description) @@ -150,7 +155,7 @@ void AboutDialog::setDescription(const TQString& description) if (!m_aboutData) return; m_description = description; - m_aboutData->setShortDescription(m_description); + m_aboutData->setShortDescription(m_description.utf8()); } void AboutDialog::setHomepage(const TQString &homepage) @@ -158,7 +163,7 @@ void AboutDialog::setHomepage(const TQString &homepage) if (!m_aboutData) return; m_homepage = homepage; - m_aboutData->setHomepage(m_homepage); + m_aboutData->setHomepage(m_homepage.utf8()); } void AboutDialog::setBugAddress(const TQString &bugAddress) @@ -166,7 +171,7 @@ void AboutDialog::setBugAddress(const TQString &bugAddress) if (!m_aboutData) return; m_bugaddress = bugAddress; - m_aboutData->setBugAddress(m_bugaddress); + m_aboutData->setBugAddress(m_bugaddress.utf8()); } void AboutDialog::setLicense(const TQString &key) @@ -195,7 +200,7 @@ void AboutDialog::setLicense(const TQString &key) { if (!key.isEmpty()) m_license = key; - m_aboutData->setLicenseText(m_license); + m_aboutData->setLicenseText(m_license.utf8()); } else { @@ -204,9 +209,9 @@ void AboutDialog::setLicense(const TQString &key) if (!key.isEmpty()) file = key; } - m_aboutData->setLicenseTextFile(file); - } - + m_aboutData->setLicenseTextFile(file.utf8()); + } + } void AboutDialog::setPopulationText(const TQString& a_text) diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h index 440541c8..fdb1b2aa 100644 --- a/kommander/widgets/aboutdialog.h +++ b/kommander/widgets/aboutdialog.h @@ -21,9 +21,9 @@ class TDEAboutData; /** @author Andras Mantia <amantia@kdewebdev.org> */ -class AboutDialog : public TQLabel, public KommanderWidget +class TDE_EXPORT AboutDialog : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/buttongroup.cpp b/kommander/widgets/buttongroup.cpp index 3d17b042..d598d64c 100644 --- a/kommander/widgets/buttongroup.cpp +++ b/kommander/widgets/buttongroup.cpp @@ -39,7 +39,7 @@ enum Functions { }; ButtonGroup::ButtonGroup(TQWidget *a_parent, const char *a_name) - : TQButtonGroup(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQButtonGroup(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "checked"; diff --git a/kommander/widgets/buttongroup.h b/kommander/widgets/buttongroup.h index cf2aa882..d9f79a86 100644 --- a/kommander/widgets/buttongroup.h +++ b/kommander/widgets/buttongroup.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT ButtonGroup : public TQButtonGroup, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/checkbox.cpp b/kommander/widgets/checkbox.cpp index 61ab0aff..f7fe20be 100644 --- a/kommander/widgets/checkbox.cpp +++ b/kommander/widgets/checkbox.cpp @@ -29,7 +29,7 @@ #include "checkbox.h" CheckBox::CheckBox(TQWidget *a_parent, const char *a_name) - : TQCheckBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQCheckBox(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "unchecked"; diff --git a/kommander/widgets/checkbox.h b/kommander/widgets/checkbox.h index 6a740246..24713e9f 100644 --- a/kommander/widgets/checkbox.h +++ b/kommander/widgets/checkbox.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT CheckBox : public TQCheckBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp index eeb2c79f..07fb7ed8 100644 --- a/kommander/widgets/closebutton.cpp +++ b/kommander/widgets/closebutton.cpp @@ -31,7 +31,7 @@ #include "closebutton.h" CloseButton::CloseButton(TQWidget* a_parent, const char* a_name) - : KPushButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KPushButton(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -39,16 +39,16 @@ CloseButton::CloseButton(TQWidget* a_parent, const char* a_name) setDisplayStates(states); setWriteStdout(true); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(startProcess())); - TQObject *parent = TQT_TQOBJECT(this); + TQObject *parent = this; while (parent->parent() != 0) { parent = parent->parent(); - if (parent->inherits(TQDIALOG_OBJECT_NAME_STRING)) + if (parent->inherits("TQDialog")) break; } - connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(reject())); + connect(this, TQ_SIGNAL(clicked()), parent, TQ_SLOT(reject())); } CloseButton::~CloseButton() @@ -105,10 +105,10 @@ void CloseButton::startProcess() KShellProcess *process = new KShellProcess("/bin/sh"); *process << at; - connect(process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(endProcess(TDEProcess *))); - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(appendOutput(TDEProcess *, + connect(process, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(endProcess(TDEProcess *))); + connect(process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(appendOutput(TDEProcess *, char *, int))); - connect(process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(appendOutput(TDEProcess *, + connect(process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(appendOutput(TDEProcess *, char *, int))); if (!process->start(TDEProcess::Block, TDEProcess::Stdout)) diff --git a/kommander/widgets/closebutton.h b/kommander/widgets/closebutton.h index 975a3f46..96a5689a 100644 --- a/kommander/widgets/closebutton.h +++ b/kommander/widgets/closebutton.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT CloseButton : public KPushButton, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/combobox.cpp b/kommander/widgets/combobox.cpp index 6ebb9c17..1bb99c2b 100644 --- a/kommander/widgets/combobox.cpp +++ b/kommander/widgets/combobox.cpp @@ -37,14 +37,14 @@ enum Functions { ComboBox::ComboBox(TQWidget *a_parent, const char *a_name) - : KComboBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KComboBox(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(emitWidgetTextChanged(int))); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(emitWidgetTextChanged(int))); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(popupList, "popupList(TQString widget)", i18n("Make the ComboBox expose it's list without mousing around."), 1); diff --git a/kommander/widgets/combobox.h b/kommander/widgets/combobox.h index 70a4c2d7..c964667d 100644 --- a/kommander/widgets/combobox.h +++ b/kommander/widgets/combobox.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT ComboBox : public KComboBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/datepicker.cpp b/kommander/widgets/datepicker.cpp index 64a064d3..6114f7f7 100644 --- a/kommander/widgets/datepicker.cpp +++ b/kommander/widgets/datepicker.cpp @@ -27,7 +27,7 @@ #include "datepicker.h" DatePicker::DatePicker(TQWidget *a_parent, const char *a_name) - : KDatePicker(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KDatePicker(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -76,13 +76,13 @@ void DatePicker::populate() void DatePicker::setWidgetText(const TQString& a_text) { - setDate(TQDate::fromString(a_text, Qt::ISODate)); + setDate(TQDate::fromString(a_text, TQt::ISODate)); emit widgetTextChanged(a_text); } TQString DatePicker::widgetText() const { - return date().toString(Qt::ISODate); + return date().toString(TQt::ISODate); } @@ -108,9 +108,9 @@ TQString DatePicker::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: - return date().toString(Qt::ISODate); + return date().toString(TQt::ISODate); case DCOP::setText: - setDate(TQDate::fromString(args[0], Qt::ISODate)); + setDate(TQDate::fromString(args[0], TQt::ISODate)); break; case DCOP::geometry: { diff --git a/kommander/widgets/datepicker.h b/kommander/widgets/datepicker.h index aa9e81e9..ddfa3be9 100644 --- a/kommander/widgets/datepicker.h +++ b/kommander/widgets/datepicker.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT DatePicker : public KDatePicker, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/dialog.cpp b/kommander/widgets/dialog.cpp index 4f73cedc..3c6ed20f 100644 --- a/kommander/widgets/dialog.cpp +++ b/kommander/widgets/dialog.cpp @@ -13,6 +13,15 @@ * (at your option) any later version. * * * ***************************************************************************/ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifndef KMDR_EXECUTOR_PATH +#define KMDR_EXECUTOR_PATH "/usr/bin/kmdr-executor" +#endif + /* KDE INCLUDES */ #include <tdelocale.h> @@ -41,7 +50,7 @@ enum Functions { }; Dialog::Dialog(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags) - : TQDialog(a_parent, a_name, a_modal, a_flags), KommanderWindow(TQT_TQOBJECT(this)) + : TQDialog(a_parent, a_name, a_modal, a_flags), KommanderWindow(this) { TQStringList states; states << "default"; @@ -50,7 +59,7 @@ Dialog::Dialog(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags setStates(states); setDisplayStates(states); m_useShebang = false; - m_shebang = "#!/usr/bin/kmdr-executor"; + m_shebang = "#!" KMDR_EXECUTOR_PATH; m_firstShow = true; KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(D_focusWidget, "focusWidget(TQString widget)", i18n("The name of the widget having focus"), 1); diff --git a/kommander/widgets/dialog.h b/kommander/widgets/dialog.h index 9f34dd94..1859ed79 100644 --- a/kommander/widgets/dialog.h +++ b/kommander/widgets/dialog.h @@ -28,7 +28,7 @@ class TQShowEvent; class KOMMANDER_EXPORT Dialog : public TQDialog, public KommanderWindow { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp index fa535813..9ab99d1f 100644 --- a/kommander/widgets/execbutton.cpp +++ b/kommander/widgets/execbutton.cpp @@ -48,7 +48,7 @@ enum Functions { }; ExecButton::ExecButton(TQWidget* a_parent, const char* a_name) - : KPushButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KPushButton(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -56,7 +56,7 @@ ExecButton::ExecButton(TQWidget* a_parent, const char* a_name) setDisplayStates(states); setWriteStdout(true); setBlockGUI(Button); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(startProcess())); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(EB_isOn, "isOn(TQString widget)", i18n("For use only when button is togle type."), 1); @@ -120,13 +120,13 @@ void ExecButton::startProcess() TDEApplication::setOverrideCursor(TQCursor(TQt::WaitCursor)); MyProcess* process = new MyProcess(this); process->setBlocking(m_blockGUI == GUI); - connect(process, TQT_SIGNAL(processExited(MyProcess*)), TQT_SLOT(processExited(MyProcess*))); + connect(process, TQ_SIGNAL(processExited(MyProcess*)), TQ_SLOT(processExited(MyProcess*))); m_output = process->run(at); if (m_blockGUI == GUI) { TDEApplication::restoreOverrideCursor(); if (writeStdout()) - cout << m_output << flush; + cout << m_output.local8Bit() << flush; } setEnabled(enabledStatus); } @@ -160,7 +160,7 @@ void ExecButton::processExited(MyProcess* p) { m_output = p->output(); if (writeStdout()) - cout << m_output << flush; + cout << m_output.local8Bit() << flush; delete p; } } diff --git a/kommander/widgets/execbutton.h b/kommander/widgets/execbutton.h index 58fb7ef5..f866f8b2 100644 --- a/kommander/widgets/execbutton.h +++ b/kommander/widgets/execbutton.h @@ -35,7 +35,7 @@ class MyProcess; class TQShowEvent; class KOMMANDER_EXPORT ExecButton : public KPushButton, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_ENUMS(Blocking) diff --git a/kommander/widgets/fileselector.cpp b/kommander/widgets/fileselector.cpp index 9d6869a7..f562662c 100644 --- a/kommander/widgets/fileselector.cpp +++ b/kommander/widgets/fileselector.cpp @@ -35,7 +35,7 @@ #include "fileselector.h" FileSelector::FileSelector(TQWidget * a_parent, const char *a_name) - : TQWidget(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQWidget(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -54,7 +54,7 @@ FileSelector::FileSelector(TQWidget * a_parent, const char *a_name) m_lineEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_selectButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); - connect(m_selectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(makeSelection())); + connect(m_selectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(makeSelection())); setSelectionType(Open); setSelectionOpenMultiple(false); diff --git a/kommander/widgets/fileselector.h b/kommander/widgets/fileselector.h index ecdbf402..2f69c872 100644 --- a/kommander/widgets/fileselector.h +++ b/kommander/widgets/fileselector.h @@ -35,7 +35,7 @@ class KLineEdit; class TQShowEvent; class KOMMANDER_EXPORT FileSelector : public TQWidget, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp index 419fc8d2..95c4fe82 100644 --- a/kommander/widgets/fontdialog.cpp +++ b/kommander/widgets/fontdialog.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "fontdialog.h" #include "kommanderplugin.h" @@ -29,7 +34,7 @@ enum Functions { }; FontDialog::FontDialog(TQWidget *parent, const char *name) - : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(parent, name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/fontdialog.h b/kommander/widgets/fontdialog.h index c9e9e7ba..039bab06 100644 --- a/kommander/widgets/fontdialog.h +++ b/kommander/widgets/fontdialog.h @@ -20,9 +20,9 @@ /** @author Andras Mantia <amantia@kdewebdev.org> */ -class FontDialog : public TQLabel, public KommanderWidget +class TDE_EXPORT FontDialog : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/groupbox.cpp b/kommander/widgets/groupbox.cpp index a90f447e..027168d8 100644 --- a/kommander/widgets/groupbox.cpp +++ b/kommander/widgets/groupbox.cpp @@ -32,7 +32,7 @@ GroupBox::GroupBox(TQWidget *a_parent, const char *a_name) - : TQGroupBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQGroupBox(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -84,13 +84,13 @@ void GroupBox::populate() void GroupBox::insertChild(TQObject *a_child) { m_childList.append(a_child); - TQT_TQOBJECT(this)->TQObject::insertChild(a_child); + this->TQObject::insertChild(a_child); } void GroupBox::removeChild(TQObject *a_child) { m_childList.remove(a_child); - TQT_TQOBJECT(this)->TQObject::removeChild(a_child); + this->TQObject::removeChild(a_child); } void GroupBox::showEvent( TQShowEvent *e ) diff --git a/kommander/widgets/groupbox.h b/kommander/widgets/groupbox.h index aac0d9ce..33472edc 100644 --- a/kommander/widgets/groupbox.h +++ b/kommander/widgets/groupbox.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT GroupBox : public TQGroupBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/konsole.cpp b/kommander/widgets/konsole.cpp index bbfc5309..dd4a955d 100644 --- a/kommander/widgets/konsole.cpp +++ b/kommander/widgets/konsole.cpp @@ -26,7 +26,7 @@ #include <myprocess.h> Konsole::Konsole(TQWidget* a_parent, const char* a_name) - : KTextEdit(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)), mSeenEOL(false), mProcess(0) + : KTextEdit(a_parent, a_name), KommanderWidget(this), mSeenEOL(false), mProcess(0) { TQStringList states; states << "default"; @@ -87,8 +87,8 @@ void Konsole::execute() mSeenEOL = false; mProcess = new MyProcess(this); mProcess->setBlocking(false); - connect(mProcess, TQT_SIGNAL(processExited(MyProcess*)), TQT_SLOT(processExited(MyProcess*))); - connect(mProcess, TQT_SIGNAL(processReceivedStdout(MyProcess*, char*, int)), TQT_SLOT(processReceivedStdout(MyProcess*, char*, int))); + connect(mProcess, TQ_SIGNAL(processExited(MyProcess*)), TQ_SLOT(processExited(MyProcess*))); + connect(mProcess, TQ_SIGNAL(processReceivedStdout(MyProcess*, char*, int)), TQ_SLOT(processReceivedStdout(MyProcess*, char*, int))); setCursor(TQCursor(TQt::WaitCursor)); mProcess->run(at); } diff --git a/kommander/widgets/konsole.h b/kommander/widgets/konsole.h index 9ab83525..5c2722e5 100644 --- a/kommander/widgets/konsole.h +++ b/kommander/widgets/konsole.h @@ -31,7 +31,7 @@ class MyProcess; class KOMMANDER_EXPORT Konsole : public KTextEdit, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/label.cpp b/kommander/widgets/label.cpp index 31d0adac..ee422325 100644 --- a/kommander/widgets/label.cpp +++ b/kommander/widgets/label.cpp @@ -26,7 +26,7 @@ #include "label.h" Label::Label(TQWidget *a_parent, const char *a_name) - : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/label.h b/kommander/widgets/label.h index 8c0b2ed3..cd49dadd 100644 --- a/kommander/widgets/label.h +++ b/kommander/widgets/label.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT Label : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/lineedit.cpp b/kommander/widgets/lineedit.cpp index 7a01ae4e..f75526d9 100644 --- a/kommander/widgets/lineedit.cpp +++ b/kommander/widgets/lineedit.cpp @@ -31,15 +31,15 @@ enum functions { }; LineEdit::LineEdit(TQWidget *a_parent, const char *a_name) - : KLineEdit(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KLineEdit(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(textChanged(const TQString &)), this, - TQT_SIGNAL(widgetTextChanged(const TQString &))); + connect(this, TQ_SIGNAL(textChanged(const TQString &)), this, + TQ_SIGNAL(widgetTextChanged(const TQString &))); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(LE_clearModified, "clearModified(TQString widget)", i18n("Clear widget modified status."), 1); diff --git a/kommander/widgets/lineedit.h b/kommander/widgets/lineedit.h index d56b3e30..581fa4cc 100644 --- a/kommander/widgets/lineedit.h +++ b/kommander/widgets/lineedit.h @@ -33,7 +33,7 @@ class TQShowEvent; class KOMMANDER_EXPORT LineEdit : public KLineEdit, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp index 5d067f9c..b1d465c6 100644 --- a/kommander/widgets/listbox.cpp +++ b/kommander/widgets/listbox.cpp @@ -30,7 +30,7 @@ #include "listbox.h" ListBox::ListBox(TQWidget *a_parent, const char *a_name) - : TDEListBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TDEListBox(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/listbox.h b/kommander/widgets/listbox.h index 61932c64..9ced5462 100644 --- a/kommander/widgets/listbox.h +++ b/kommander/widgets/listbox.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT ListBox : public TDEListBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/pixmaplabel.cpp b/kommander/widgets/pixmaplabel.cpp index a9298530..3d71ab1e 100644 --- a/kommander/widgets/pixmaplabel.cpp +++ b/kommander/widgets/pixmaplabel.cpp @@ -31,7 +31,7 @@ #include "pixmaplabel.h" PixmapLabel::PixmapLabel(TQWidget *a_parent, const char *a_name) - : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/pixmaplabel.h b/kommander/widgets/pixmaplabel.h index 35538be1..3fbf08fe 100644 --- a/kommander/widgets/pixmaplabel.h +++ b/kommander/widgets/pixmaplabel.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT PixmapLabel : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp index 343526ae..b24e5956 100644 --- a/kommander/widgets/popupmenu.cpp +++ b/kommander/widgets/popupmenu.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "popupmenu.h" #include "specials.h" @@ -33,7 +38,7 @@ #define LAST_FUNCTION INSERTSUBMENU PopupMenu::PopupMenu(TQWidget *parent, const char *name) - : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(parent, name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -50,7 +55,7 @@ PopupMenu::PopupMenu(TQWidget *parent, const char *name) setHidden(true); m_menu = new TDEPopupMenu(this); - connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuItemActivated(int))); + connect(m_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuItemActivated(int))); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(INSERTMENUITEM, "insertMenuItem(TQString widget, TQString text, TQString executeWidget, int index, TQString icon)", i18n("Insert an item into the popup menu. The executeWidget's execute method will be run when this item is selected. Returns the id of the inserted item. Use -1 for index to insert to the end. The icon is optional."), 4, 5); diff --git a/kommander/widgets/popupmenu.h b/kommander/widgets/popupmenu.h index 7d691ff0..60a095e3 100644 --- a/kommander/widgets/popupmenu.h +++ b/kommander/widgets/popupmenu.h @@ -22,9 +22,9 @@ class TDEPopupMenu; /** @author Andras Mantia <amantia@kdewebdev.org> */ -class PopupMenu : public TQLabel, public KommanderWidget +class TDE_EXPORT PopupMenu : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/progressbar.cpp b/kommander/widgets/progressbar.cpp index 111ffe9f..88e253e9 100644 --- a/kommander/widgets/progressbar.cpp +++ b/kommander/widgets/progressbar.cpp @@ -36,7 +36,7 @@ enum Functions { }; ProgressBar::ProgressBar(TQWidget *a_parent, const char *a_name) - : KProgress(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KProgress(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/progressbar.h b/kommander/widgets/progressbar.h index 7570b681..9532e139 100644 --- a/kommander/widgets/progressbar.h +++ b/kommander/widgets/progressbar.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT ProgressBar: public KProgress, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/radiobutton.cpp b/kommander/widgets/radiobutton.cpp index d6306c80..ba46248d 100644 --- a/kommander/widgets/radiobutton.cpp +++ b/kommander/widgets/radiobutton.cpp @@ -28,7 +28,7 @@ #include "radiobutton.h" RadioButton::RadioButton(TQWidget *a_parent, const char *a_name) - : TQRadioButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQRadioButton(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "unchecked"; diff --git a/kommander/widgets/radiobutton.h b/kommander/widgets/radiobutton.h index 2870a230..15f18a78 100644 --- a/kommander/widgets/radiobutton.h +++ b/kommander/widgets/radiobutton.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT RadioButton : public TQRadioButton, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp index 3233ea8f..33127372 100644 --- a/kommander/widgets/richtexteditor.cpp +++ b/kommander/widgets/richtexteditor.cpp @@ -43,7 +43,7 @@ #include "pixmaps/textright.xpm" RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name) - : TQWidget(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQWidget(a_parent, a_name), KommanderWidget(this) { TQStringList states; @@ -84,15 +84,15 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name) m_buttonTextBold = new TQToolButton(m_formatGroup, "textBold"); m_buttonTextBold->setPixmap(TQPixmap((const char **)bold_xpm)); m_buttonTextBold->setToggleButton(true); - connect(m_buttonTextBold, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textBold(bool))); + connect(m_buttonTextBold, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(textBold(bool))); m_buttonTextItalic = new TQToolButton(m_formatGroup, "textItalic"); m_buttonTextItalic->setPixmap(TQPixmap((const char **)italic_xpm)); m_buttonTextItalic->setToggleButton(true); - connect(m_buttonTextItalic, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textItalic(bool))); + connect(m_buttonTextItalic, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(textItalic(bool))); m_buttonTextUnder = new TQToolButton(m_formatGroup, "textUnder"); m_buttonTextUnder->setPixmap(TQPixmap((const char **)under_xpm)); m_buttonTextUnder->setToggleButton(true); - connect(m_buttonTextUnder, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textUnder(bool))); + connect(m_buttonTextUnder, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(textUnder(bool))); m_buttonTextLeft = new TQToolButton(m_alignGroup, "textLeft"); m_buttonTextLeft->setPixmap(TQPixmap((const char **)left_xpm)); @@ -104,11 +104,11 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name) m_buttonTextRight->setPixmap(TQPixmap((const char **)right_xpm)); m_buttonTextRight->setToggleButton(true); - connect(m_alignGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(textAlign(int))); - connect(m_textedit, TQT_SIGNAL(currentFontChanged(const TQFont &)), this, TQT_SLOT(fontChanged(const TQFont &))); - connect(m_textedit, TQT_SIGNAL(currentAlignmentChanged(int)), this, TQT_SLOT(alignmentChanged(int))); + connect(m_alignGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(textAlign(int))); + connect(m_textedit, TQ_SIGNAL(currentFontChanged(const TQFont &)), this, TQ_SLOT(fontChanged(const TQFont &))); + connect(m_textedit, TQ_SIGNAL(currentAlignmentChanged(int)), this, TQ_SLOT(alignmentChanged(int))); - connect(m_textedit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setTextChanged())); + connect(m_textedit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setTextChanged())); } diff --git a/kommander/widgets/richtexteditor.h b/kommander/widgets/richtexteditor.h index b7fd1540..79119f94 100644 --- a/kommander/widgets/richtexteditor.h +++ b/kommander/widgets/richtexteditor.h @@ -36,7 +36,7 @@ class TQHButtonGroup; class TQShowEvent; class KOMMANDER_EXPORT RichTextEditor : public TQWidget, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/scriptobject.cpp b/kommander/widgets/scriptobject.cpp index 514c4ae5..2b444471 100644 --- a/kommander/widgets/scriptobject.cpp +++ b/kommander/widgets/scriptobject.cpp @@ -30,7 +30,7 @@ #include <specials.h> ScriptObject::ScriptObject(TQWidget *a_parent, const char *a_name) - : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/scriptobject.h b/kommander/widgets/scriptobject.h index 2a954f2d..9d427351 100644 --- a/kommander/widgets/scriptobject.h +++ b/kommander/widgets/scriptobject.h @@ -28,7 +28,7 @@ class KOMMANDER_EXPORT ScriptObject : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/slider.cpp b/kommander/widgets/slider.cpp index b8068ede..8c7d06bf 100644 --- a/kommander/widgets/slider.cpp +++ b/kommander/widgets/slider.cpp @@ -23,7 +23,7 @@ #include "slider.h" Slider::Slider(TQWidget * a_parent, const char *a_name) - : TQSlider(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQSlider(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/slider.h b/kommander/widgets/slider.h index 517f00e9..4bb1f1e3 100644 --- a/kommander/widgets/slider.h +++ b/kommander/widgets/slider.h @@ -29,7 +29,7 @@ class TQShowEvent; class KOMMANDER_EXPORT Slider: public TQSlider, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/spinboxint.cpp b/kommander/widgets/spinboxint.cpp index 72991376..a2b9af6a 100644 --- a/kommander/widgets/spinboxint.cpp +++ b/kommander/widgets/spinboxint.cpp @@ -28,7 +28,7 @@ #include "spinboxint.h" SpinBoxInt::SpinBoxInt(TQWidget *a_parent, const char *a_name) - : TQSpinBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQSpinBox(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/spinboxint.h b/kommander/widgets/spinboxint.h index 777ee291..93b75813 100644 --- a/kommander/widgets/spinboxint.h +++ b/kommander/widgets/spinboxint.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT SpinBoxInt : public TQSpinBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/statusbar.cpp b/kommander/widgets/statusbar.cpp index 3c5e76f5..0a3a249f 100644 --- a/kommander/widgets/statusbar.cpp +++ b/kommander/widgets/statusbar.cpp @@ -27,7 +27,7 @@ #include "statusbar.h" StatusBar::StatusBar(TQWidget *a_parent, const char *a_name) - : KStatusBar(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KStatusBar(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/statusbar.h b/kommander/widgets/statusbar.h index f7e8f139..91fbe0b6 100644 --- a/kommander/widgets/statusbar.h +++ b/kommander/widgets/statusbar.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT StatusBar : public KStatusBar, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/subdialog.cpp b/kommander/widgets/subdialog.cpp index 47e4ec69..66c8770b 100644 --- a/kommander/widgets/subdialog.cpp +++ b/kommander/widgets/subdialog.cpp @@ -32,14 +32,14 @@ #include "subdialog.h" SubDialog::SubDialog(TQWidget *a_parent, const char *a_name) - : TQPushButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)), m_dialog(0) + : TQPushButton(a_parent, a_name), KommanderWidget(this), m_dialog(0) { TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(showDialog())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(showDialog())); } @@ -103,7 +103,7 @@ void SubDialog::showDialog() if(!m_dialog) { kdWarning() << "Creation of sub dialog failed .." << endl; - connect(m_dialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFinished())); + connect(m_dialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotFinished())); m_dialog->exec(); } diff --git a/kommander/widgets/subdialog.h b/kommander/widgets/subdialog.h index bbf07e21..7f742c51 100644 --- a/kommander/widgets/subdialog.h +++ b/kommander/widgets/subdialog.h @@ -33,7 +33,7 @@ class TQDialog; class TQShowEvent; class KOMMANDER_EXPORT SubDialog : public TQPushButton, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/table.cpp b/kommander/widgets/table.cpp index 49ea5c19..6a8abc4b 100644 --- a/kommander/widgets/table.cpp +++ b/kommander/widgets/table.cpp @@ -48,7 +48,7 @@ enum Functions { Table::Table(TQWidget *a_parent, const char *a_name) - : TQTable(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQTable(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -57,11 +57,11 @@ Table::Table(TQWidget *a_parent, const char *a_name) KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(TBL_sortColumnExtra, "sortColumnExtra(TQString widget, int col, bool ascending, bool wholeRows)", i18n("Sets a column to sort ascending or descending. Optionally can sort with rows intact for database use."), 2, 4); KommanderPlugin::registerFunction(TBL_keepCellVisible, "keepCellVisible(TQString widget, int row, int col)", i18n("Scrolls the table so the cell indicated is visible."), 3); - KommanderPlugin::registerFunction(TBL_selectCells, "selectCells(TQString widget, int row, int col, int row, int col)", i18n("Select cells using the upper left and lower right cell addresses<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 5); + KommanderPlugin::registerFunction(TBL_selectCells, "selectCells(TQString widget, int row, int col, int row, int col)", i18n("Select cells using the upper left and lower right cell addresses"), 5); KommanderPlugin::registerFunction(TBL_selectRow, "selectRow(TQString widget, int row)", i18n("Select the row with the zero based index."), 2); - KommanderPlugin::registerFunction(TBL_selectColumn, "selectColumn(TQString widget, int col)", i18n("Select the column with the zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 2); - KommanderPlugin::registerFunction(TBL_setColumnReadOnly, "setColumnReadOnly(TQString widget, int col, bool Readonly)", i18n("Set the column read only using zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 3); - KommanderPlugin::registerFunction(TBL_setRowReadOnly, "setRowReadOnly(TQString widget, int row, bool Readonly)", i18n("Set the row read only using zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 3); + KommanderPlugin::registerFunction(TBL_selectColumn, "selectColumn(TQString widget, int col)", i18n("Select the column with the zero based index."), 2); + KommanderPlugin::registerFunction(TBL_setColumnReadOnly, "setColumnReadOnly(TQString widget, int col, bool Readonly)", i18n("Set the column read only using zero based index."), 3); + KommanderPlugin::registerFunction(TBL_setRowReadOnly, "setRowReadOnly(TQString widget, int row, bool Readonly)", i18n("Set the row read only using zero based index."), 3); KommanderPlugin::registerFunction(TBL_rowCount, "rowCount(TQString widget)", i18n("Returns the number of rows of the table"), 1); KommanderPlugin::registerFunction(TBL_colHeader, "columnHeader(TQString widget, int Column)", i18n("Returns the text of the header for the column index"), 2); KommanderPlugin::registerFunction(TBL_rowHeader, "rowHeader(TQString widget, int Row)", i18n("Returns the text of the header for the row index"), 2); @@ -131,7 +131,7 @@ void Table::setCellWidget(int row, int col, const TQString & _widgetName) KommanderWidget *w = widgetByName(_widgetName); if (w) { - TQWidget *widget = TQT_TQWIDGET(w->object()); + TQWidget *widget = static_cast<TQWidget*>(w->object()); if (TQTable::cellWidget(row, col) != widget) { setCurrentCell(-1, -1); //hack to not delete the cellwidget after clicking away to another cell. diff --git a/kommander/widgets/table.h b/kommander/widgets/table.h index 3a95b483..21f3dc58 100644 --- a/kommander/widgets/table.h +++ b/kommander/widgets/table.h @@ -30,7 +30,7 @@ class TQWidget; class KOMMANDER_EXPORT Table : public TQTable, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/tabwidget.cpp b/kommander/widgets/tabwidget.cpp index 7180a7d0..b4116fe3 100644 --- a/kommander/widgets/tabwidget.cpp +++ b/kommander/widgets/tabwidget.cpp @@ -44,7 +44,7 @@ enum Functions { }; TabWidget::TabWidget(TQWidget *a_parent, const char *a_name, int a_flags) - : TQTabWidget(a_parent, a_name, a_flags), KommanderWidget(TQT_TQOBJECT(this)) + : TQTabWidget(a_parent, a_name, a_flags), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/tabwidget.h b/kommander/widgets/tabwidget.h index 818879ec..6eb0747a 100644 --- a/kommander/widgets/tabwidget.h +++ b/kommander/widgets/tabwidget.h @@ -27,7 +27,7 @@ class TQShowEvent; class KOMMANDER_EXPORT TabWidget : public TQTabWidget, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/textbrowser.cpp b/kommander/widgets/textbrowser.cpp index 9e466c5e..5a6e1576 100644 --- a/kommander/widgets/textbrowser.cpp +++ b/kommander/widgets/textbrowser.cpp @@ -35,7 +35,7 @@ enum Functions { }; TextBrowser::TextBrowser(TQWidget * a_parent, const char *a_name) - : KTextBrowser(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KTextBrowser(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -121,7 +121,7 @@ TQString TextBrowser::handleDCOP(int function, const TQStringList& args) case DCOP::selection: return selectedText(); case TBR_setNotifyClick: - KTextBrowser::setNotifyClick(args[0]); + KTextBrowser::setNotifyClick(args[0].utf8()); break; case TBR_isNotifyClick: return TQString::number(KTextBrowser::isNotifyClick()); diff --git a/kommander/widgets/textbrowser.h b/kommander/widgets/textbrowser.h index 18c99712..f134891a 100644 --- a/kommander/widgets/textbrowser.h +++ b/kommander/widgets/textbrowser.h @@ -29,7 +29,7 @@ class TQShowEvent; class KOMMANDER_EXPORT TextBrowser: public KTextBrowser, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/textedit.cpp b/kommander/widgets/textedit.cpp index aa2b7c9d..ad5f06d9 100644 --- a/kommander/widgets/textedit.cpp +++ b/kommander/widgets/textedit.cpp @@ -43,14 +43,14 @@ enum Functions { }; TextEdit::TextEdit(TQWidget * a_parent, const char *a_name):KTextEdit(a_parent, a_name), -KommanderWidget(TQT_TQOBJECT(this)) +KommanderWidget(this) { TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setTextChanged())); + connect(this, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setTextChanged())); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(TE_setModified, "setModified(TQString widget, bool Modified)", i18n("Set widget modified status."), 1); diff --git a/kommander/widgets/textedit.h b/kommander/widgets/textedit.h index a1713fd9..d445d563 100644 --- a/kommander/widgets/textedit.h +++ b/kommander/widgets/textedit.h @@ -31,7 +31,7 @@ class TQShowEvent; class KOMMANDER_EXPORT TextEdit: public KTextEdit, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/timer.cpp b/kommander/widgets/timer.cpp index b91d0eb5..ea39706c 100644 --- a/kommander/widgets/timer.cpp +++ b/kommander/widgets/timer.cpp @@ -38,7 +38,7 @@ enum Functions { }; Timer::Timer(TQWidget *a_parent, const char *a_name) - : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -57,7 +57,7 @@ Timer::Timer(TQWidget *a_parent, const char *a_name) mTimer = new TQTimer(this); setInterval(5000); setSingleShot(false); - connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(SetInterval, "setInterval(TQString widget, int interval)", i18n("Set the timer timeout interval in ms."), 2); @@ -148,7 +148,7 @@ void Timer::timeout() void Timer::execute() { if (mSingleShot) - TQTimer::singleShot(mInterval, this, TQT_SLOT(timeout())); + TQTimer::singleShot(mInterval, this, TQ_SLOT(timeout())); else mTimer->start(mInterval); } diff --git a/kommander/widgets/timer.h b/kommander/widgets/timer.h index fa3523ad..d53550a9 100644 --- a/kommander/widgets/timer.h +++ b/kommander/widgets/timer.h @@ -26,7 +26,7 @@ class TQTimer; class KOMMANDER_EXPORT Timer : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp index 6dfc8b89..0bebe1bb 100644 --- a/kommander/widgets/toolbox.cpp +++ b/kommander/widgets/toolbox.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "toolbox.h" #include "kommanderplugin.h" #include "specials.h" @@ -28,7 +33,7 @@ #define LAST_FUNCTION INDEXOF ToolBox::ToolBox(TQWidget *parent, const char *name) - : TQToolBox(parent, name), KommanderWidget(TQT_TQOBJECT(this)) + : TQToolBox(parent, name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/toolbox.h b/kommander/widgets/toolbox.h index 1d253c90..4d596bb2 100644 --- a/kommander/widgets/toolbox.h +++ b/kommander/widgets/toolbox.h @@ -18,9 +18,10 @@ /** @author Andras Mantia <amantia@kdewebdev.org> */ -class ToolBox : public TQToolBox, public KommanderWidget + +class TDE_EXPORT ToolBox : public TQToolBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp index 15949534..c2d6f87a 100644 --- a/kommander/widgets/treewidget.cpp +++ b/kommander/widgets/treewidget.cpp @@ -55,7 +55,7 @@ enum Functions { }; TreeWidget::TreeWidget(TQWidget *a_parent, const char *a_name) - : TDEListView(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TDEListView(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/treewidget.h b/kommander/widgets/treewidget.h index 291a254e..e3bb7f4f 100644 --- a/kommander/widgets/treewidget.h +++ b/kommander/widgets/treewidget.h @@ -34,7 +34,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT TreeWidget : public TDEListView, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/widgets.desktop b/kommander/widgets/widgets.desktop index f24396de..e0ac75a9 100644 --- a/kommander/widgets/widgets.desktop +++ b/kommander/widgets/widgets.desktop @@ -1,36 +1,6 @@ [Desktop Entry] Name=Widgets -Name[bg]=Графични обекти -Name[br]=Widgetoù -Name[ca]=Estris -Name[cs]=Widgety -Name[cy]=Celfigion -Name[da]=Kontroller -Name[el]=Γραφικά συστατικά -Name[et]=Elemendid -Name[fa]=عناصر -Name[fi]=Elementit -Name[fr]=Éléments graphiques -Name[ga]=Giuirléidí -Name[hi]=विजेट्स -Name[hu]=Grafikai elemek -Name[ja]=ウィジェット -Name[lt]=Valdikliai -Name[ms]=Wijet -Name[ne]=विजेट -Name[pl]=Elementy interfejsu -Name[pt]=Elementos -Name[pt_BR]=Janelas -Name[ru]=Виджеты -Name[sl]=Gradniki -Name[sr]=Контроле -Name[sr@Latn]=Kontrole -Name[sv]=Grafiska komponenter -Name[ta]=சின்னப் படங்கள் -Name[tg]=Васеъкуниҳо -Name[tr]=Bileşenler -Name[uk]=Віджети -Name[zh_CN]=部件 -Exec=widgets %i %m -caption "%c" + Type=Application +Exec=widgets %i %m -caption "%c" Terminal=false diff --git a/kommander/widgets/wizard.cpp b/kommander/widgets/wizard.cpp index 797ed009..0ae537de 100644 --- a/kommander/widgets/wizard.cpp +++ b/kommander/widgets/wizard.cpp @@ -32,7 +32,7 @@ Wizard::Wizard(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags) - : TQWizard(a_parent, a_name, a_modal, a_flags), KommanderWidget(TQT_TQOBJECT(this)) + : TQWizard(a_parent, a_name, a_modal, a_flags), KommanderWidget(this) { TQStringList states; states << "default"; @@ -41,7 +41,7 @@ Wizard::Wizard(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(helpClicked()), TQT_SLOT(runHelp())); + connect(this, TQ_SIGNAL(helpClicked()), TQ_SLOT(runHelp())); } Wizard::~Wizard() diff --git a/kommander/widgets/wizard.h b/kommander/widgets/wizard.h index d8bbab45..7b3b6fdf 100644 --- a/kommander/widgets/wizard.h +++ b/kommander/widgets/wizard.h @@ -29,7 +29,7 @@ class TQShowEvent; class KOMMANDER_EXPORT Wizard : public TQWizard, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) |