diff options
| -rw-r--r-- | src/document/RosegardenGUIDoc.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kdeext/klearlook.cpp | 12 | ||||
| -rw-r--r-- | src/gui/studio/DeviceEditorDialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/studio/DeviceManagerDialog.cpp | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp index 397b12c..18c80d0 100644 --- a/src/document/RosegardenGUIDoc.cpp +++ b/src/document/RosegardenGUIDoc.cpp @@ -2923,7 +2923,7 @@ RosegardenGUIDoc::getTimers() return list; } - if (replyType != TQSTRING_OBJECT_NAME_STRING) { + if (replyType != "TQString") { RG_DEBUG << "RosegardenGUIDoc::getTimers - " << "wrong reply type (" << replyType << ") from sequencer" << endl; return list; @@ -2951,7 +2951,7 @@ RosegardenGUIDoc::getCurrentTimer() return ""; } - if (replyType != TQSTRING_OBJECT_NAME_STRING) { + if (replyType != "TQString") { RG_DEBUG << "RosegardenGUIDoc::getCurrentTimer - " << "wrong reply type (" << replyType << ") from sequencer" << endl; return ""; diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp index 7701248..28e9838 100644 --- a/src/gui/kdeext/klearlook.cpp +++ b/src/gui/kdeext/klearlook.cpp @@ -519,7 +519,7 @@ hoverSect( TQTC_NO_SECT ) { } void KlearlookStyle::applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { - if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQApplication")) { TQApplication *app = reinterpret_cast<TQApplication*>(ptr); if ( !qstrcmp( app->argv() [ 0 ], "kicker" ) || !qstrcmp( app->argv() [ 0 ], "appletproxy" ) ) { @@ -589,13 +589,13 @@ void KlearlookStyle::polish( TQPalette &pal ) { static const char * kdeToolbarWidget = "tde toolbar widget"; void KlearlookStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); if ( ::tqqt_cast<TQRadioButton *>( widget ) || ::tqqt_cast<TQCheckBox *>( widget ) || ::tqqt_cast<TQSpinWidget *>( widget ) - || widget->inherits( TQSPLITTERHANDLE_OBJECT_NAME_STRING ) ) { + || widget->inherits( "TQSplitterHandle" ) ) { widget->setMouseTracking( true ); installObjectEventHandler(ceData, elementFlags, ptr, this); @@ -632,13 +632,13 @@ void KlearlookStyle::polish( const TQStyleControlElementData &ceData, ControlEle } void KlearlookStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); if ( ::tqqt_cast<TQRadioButton *>( widget ) || ::tqqt_cast<TQCheckBox *>( widget ) || ::tqqt_cast<TQSpinWidget *>( widget ) || - widget->inherits( TQSPLITTERHANDLE_OBJECT_NAME_STRING ) ) { + widget->inherits( "TQSplitterHandle" ) ) { widget->setMouseTracking( false ); removeObjectEventHandler(ceData, elementFlags, ptr, this); @@ -676,7 +676,7 @@ void KlearlookStyle::unPolish( const TQStyleControlElementData &ceData, ControlE } bool KlearlookStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) { - if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQObject")) { TQObject* object = reinterpret_cast<TQObject*>(source); if ( object->parent() && 0 == qstrcmp( object->name(), kdeToolbarWidget ) ) { diff --git a/src/gui/studio/DeviceEditorDialog.cpp b/src/gui/studio/DeviceEditorDialog.cpp index 9d96ba1..d71dd6f 100644 --- a/src/gui/studio/DeviceEditorDialog.cpp +++ b/src/gui/studio/DeviceEditorDialog.cpp @@ -219,7 +219,7 @@ DeviceEditorDialog::makeConnectionList(unsigned int direction, TQDataStream reply(replyData, IO_ReadOnly); TQString connection; - if (replyType == TQSTRING_OBJECT_NAME_STRING) { + if (replyType == "TQString") { reply >> connection; list.append(connection); } diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp index b15e0dd..ce9eb49 100644 --- a/src/gui/studio/DeviceManagerDialog.cpp +++ b/src/gui/studio/DeviceManagerDialog.cpp @@ -441,7 +441,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, TQDataStream reply(replyData, IO_ReadOnly); TQString connection; - if (replyType == TQSTRING_OBJECT_NAME_STRING) { + if (replyType == "TQString") { reply >> connection; list.append(connection); } |