From 36c049e135b0cec7cf97b41888860186813df5f0 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 12 Jul 2023 11:09:49 +0900 Subject: Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3. Signed-off-by: Michele Calgaro --- tdecore/klibloader.h | 8 +++---- tdecore/tdeaccelmanager.cpp | 2 +- tdecore/tdeapplication.cpp | 8 +++---- tdecore/tdeconfigdialogmanager.cpp | 46 +++++++++++++++++++------------------- 4 files changed, 32 insertions(+), 32 deletions(-) (limited to 'tdecore') diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h index d9e632184..9cde81816 100644 --- a/tdecore/klibloader.h +++ b/tdecore/klibloader.h @@ -349,7 +349,7 @@ public: * It is valid behavior to create different kinds of objects * depending on the requested @p classname. For example a koffice * library may usually return a pointer to KoDocument. But - * if asked for a TQWIDGET_OBJECT_NAME_STRING, it could create a wrapper widget, + * if asked for a "TQWidget", it could create a wrapper widget, * that encapsulates the Koffice specific features. * * create() automatically emits a signal objectCreated to tell @@ -363,7 +363,7 @@ public: * @param args a list of arguments */ - TQObject* create( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + TQObject* create( TQObject* parent = 0, const char* name = 0, const char* classname = "TQObject", const TQStringList &args = TQStringList() ); signals: /** @@ -382,7 +382,7 @@ protected: * It is valid behavior to create different kinds of objects * depending on the requested @p className. For example a koffice * library may usually return a pointer to KoDocument. But - * if asked for a TQWIDGET_OBJECT_NAME_STRING, it could create a wrapper widget, + * if asked for a "TQWidget", it could create a wrapper widget, * that encapsulates the Koffice specific features. * * This function is called by #create() @@ -392,7 +392,7 @@ protected: * @param args a list of arguments */ virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* className = TQOBJECT_OBJECT_NAME_STRING, + const char* className = "TQObject", const TQStringList &args = TQStringList() ) = 0; diff --git a/tdecore/tdeaccelmanager.cpp b/tdecore/tdeaccelmanager.cpp index 4618dab17..8d352e027 100644 --- a/tdecore/tdeaccelmanager.cpp +++ b/tdecore/tdeaccelmanager.cpp @@ -262,7 +262,7 @@ void TDEAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &u void TDEAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item) { - TQObjectList *childList = widget->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, false); + TQObjectList *childList = widget->queryList("TQWidget", 0, false, false); for ( TQObject *it = childList->first(); it; it = childList->next() ) { TQWidget *w = TQT_TQWIDGET(it); diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp index 6dcafa2d5..ec05a6cd2 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -2540,8 +2540,8 @@ void TDEApplication::tdedisplaySetPalette() void TDEApplication::tdedisplaySetFont() { TQApplication::setFont(TDEGlobalSettings::generalFont(), true); - TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING); - TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING); + TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TQMenuBar"); + TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TQPopupMenu"); TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TDEPopupTitle"); // "patch" standard TQStyleSheet to follow our fonts @@ -2644,8 +2644,8 @@ void TDEApplication::installKDEPropertyMap() kdeMap->insert( "KIntSpinBox", "value" ); kdeMap->insert( "KDoubleNumInput", "value" ); // Temp til fixed in QT then enable ifdef with the correct version num - kdeMap->insert( TQGROUPBOX_OBJECT_NAME_STRING, "checked" ); - kdeMap->insert( TQTABWIDGET_OBJECT_NAME_STRING, "currentPage" ); + kdeMap->insert( "TQGroupBox", "checked" ); + kdeMap->insert( "TQTabWidget", "currentPage" ); TQSqlPropertyMap::installDefaultMap( kdeMap ); #endif } diff --git a/tdecore/tdeconfigdialogmanager.cpp b/tdecore/tdeconfigdialogmanager.cpp index 9578c05c1..9646c897e 100644 --- a/tdecore/tdeconfigdialogmanager.cpp +++ b/tdecore/tdeconfigdialogmanager.cpp @@ -69,29 +69,29 @@ void TDEConfigDialogManager::init(bool trackChanges) if(trackChanges) { // QT - changedMap.insert(TQBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQCHECKBOX_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQPUSHBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQRADIOBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int))); + changedMap.insert("TQButton", TQT_SIGNAL(stateChanged(int))); + changedMap.insert("TQCheckBox", TQT_SIGNAL(stateChanged(int))); + changedMap.insert("TQPushButton", TQT_SIGNAL(stateChanged(int))); + changedMap.insert("TQRadioButton", TQT_SIGNAL(stateChanged(int))); // We can only store one thing, so you can't have // a ButtonGroup that is checkable. - changedMap.insert(TQBUTTONGROUP_OBJECT_NAME_STRING, TQT_SIGNAL(clicked(int))); - changedMap.insert(TQGROUPBOX_OBJECT_NAME_STRING, TQT_SIGNAL(toggled(bool))); - changedMap.insert(TQCOMBOBOX_OBJECT_NAME_STRING, TQT_SIGNAL(activated (int))); + changedMap.insert("TQButtonGroup", TQT_SIGNAL(clicked(int))); + changedMap.insert("TQGroupBox", TQT_SIGNAL(toggled(bool))); + changedMap.insert("TQComboBox", TQT_SIGNAL(activated (int))); //qsqlproperty map doesn't store the text, but the value! - //changedMap.insert(TQCOMBOBOX_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert(TQDATEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQDate &))); - changedMap.insert(TQDATETIMEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQDateTime &))); - changedMap.insert(TQDIAL_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged (int))); - changedMap.insert(TQLINEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert(TQSLIDER_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(int))); - changedMap.insert(TQSPINBOX_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(int))); - changedMap.insert(TQTIMEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQTime &))); - changedMap.insert(TQTEXTEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged())); - changedMap.insert(TQTEXTBROWSER_OBJECT_NAME_STRING, TQT_SIGNAL(sourceChanged(const TQString &))); - changedMap.insert(TQMULTILINEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged())); - changedMap.insert(TQLISTBOX_OBJECT_NAME_STRING, TQT_SIGNAL(selectionChanged())); - changedMap.insert(TQTABWIDGET_OBJECT_NAME_STRING, TQT_SIGNAL(currentChanged(TQWidget *))); + //changedMap.insert("TQComboBox", TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert("TQDateEdit", TQT_SIGNAL(valueChanged(const TQDate &))); + changedMap.insert("TQDateTimeEdit", TQT_SIGNAL(valueChanged(const TQDateTime &))); + changedMap.insert("TQDial", TQT_SIGNAL(valueChanged (int))); + changedMap.insert("TQLineEdit", TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert("TQSlider", TQT_SIGNAL(valueChanged(int))); + changedMap.insert("TQSpinBox", TQT_SIGNAL(valueChanged(int))); + changedMap.insert("TQTimeEdit", TQT_SIGNAL(valueChanged(const TQTime &))); + changedMap.insert("TQTextEdit", TQT_SIGNAL(textChanged())); + changedMap.insert("TQTextBrowser", TQT_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert("TQMultiLineEdit", TQT_SIGNAL(textChanged())); + changedMap.insert("TQListBox", TQT_SIGNAL(selectionChanged())); + changedMap.insert("TQTabWidget", TQT_SIGNAL(currentChanged(TQWidget *))); // KDE changedMap.insert( "KComboBox", TQT_SIGNAL(activated (int))); @@ -218,7 +218,7 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha kdWarning(178) << "A widget named '" << widgetName << "' was found but there is no setting named '" << configId << "'" << endl; } } - else if (childWidget->inherits(TQLABEL_OBJECT_NAME_STRING)) + else if (childWidget->inherits("TQLabel")) { TQLabel *label = static_cast(childWidget); TQWidget *buddy = label->buddy(); @@ -238,8 +238,8 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha TQMap::const_iterator changedIt = changedMap.find(childWidget->className()); if (changedIt != changedMap.end()) { - if ((!d->insideGroupBox || !childWidget->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING)) && - !childWidget->inherits(TQGROUPBOX_OBJECT_NAME_STRING)) + if ((!d->insideGroupBox || !childWidget->inherits("TQRadioButton")) && + !childWidget->inherits("TQGroupBox")) kdDebug(178) << "Widget '" << widgetName << "' (" << childWidget->className() << ") remains unmanaged." << endl; } } -- cgit v1.2.1