From 2b5e80f73636f80085572ae51cb04d67ea59b3b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 21 Aug 2010 02:36:48 +0000 Subject: Fixed kcfg_ widgets not emitting signals git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1166131 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdecore/kconfigdialogmanager.cpp | 40 ++++++++++++++++++++-------------------- kdecore/kglobalsettings.cpp | 10 +++++----- kdecore/kkeyserver_x11.h | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/kdecore/kconfigdialogmanager.cpp b/kdecore/kconfigdialogmanager.cpp index 7e549e0b0..411ed2a90 100644 --- a/kdecore/kconfigdialogmanager.cpp +++ b/kdecore/kconfigdialogmanager.cpp @@ -69,29 +69,29 @@ void KConfigDialogManager::init(bool trackChanges) if(trackChanges) { // QT - 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))); + changedMap.insert("QButton", TQT_SIGNAL(stateChanged(int))); + changedMap.insert("QCheckBox", TQT_SIGNAL(stateChanged(int))); + changedMap.insert("QPushButton", TQT_SIGNAL(stateChanged(int))); + changedMap.insert("QRadioButton", TQT_SIGNAL(stateChanged(int))); // We can only store one thing, so you can't have // a ButtonGroup that is checkable. - changedMap.insert("TQButtonGroup", TQT_SIGNAL(clicked(int))); - changedMap.insert("TQGroupBox", TQT_SIGNAL(toggled(bool))); - changedMap.insert("TQComboBox", TQT_SIGNAL(activated (int))); + changedMap.insert("QButtonGroup", TQT_SIGNAL(clicked(int))); + changedMap.insert("QGroupBox", TQT_SIGNAL(toggled(bool))); + changedMap.insert("QComboBox", TQT_SIGNAL(activated (int))); //qsqlproperty map doesn't store the text, but the value! - //changedMap.insert("TQComboBox", TQT_SIGNAL(textChanged(const TQString &))); + //changedMap.insert("QComboBox", TQT_SIGNAL(textChanged(const TQString &))); changedMap.insert("QDateEdit", TQT_SIGNAL(valueChanged(const TQDate &))); changedMap.insert("QDateTimeEdit", 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("QDial", TQT_SIGNAL(valueChanged (int))); + changedMap.insert("QLineEdit", TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert("QSlider", TQT_SIGNAL(valueChanged(int))); + changedMap.insert("QSpinBox", TQT_SIGNAL(valueChanged(int))); changedMap.insert("QTimeEdit", 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 *))); + changedMap.insert("QTextEdit", TQT_SIGNAL(textChanged())); + changedMap.insert("QTextBrowser", TQT_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert("QMultiLineEdit", TQT_SIGNAL(textChanged())); + changedMap.insert("QListBox", TQT_SIGNAL(selectionChanged())); + changedMap.insert("QTabWidget", TQT_SIGNAL(currentChanged(TQWidget *))); // KDE changedMap.insert( "KComboBox", TQT_SIGNAL(activated (int))); @@ -219,7 +219,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang assert(false); } } - else if (childWidget->inherits("TQLabel")) + else if (childWidget->inherits("QLabel")) { TQLabel *label = static_cast(childWidget); TQWidget *buddy = label->buddy(); @@ -239,8 +239,8 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang TQMap::const_iterator changedIt = changedMap.find(childWidget->className()); if (changedIt != changedMap.end()) { - if ((!d->insideGroupBox || !childWidget->inherits("TQRadioButton")) && - !childWidget->inherits("TQGroupBox")) + if ((!d->insideGroupBox || !childWidget->inherits("QRadioButton")) && + !childWidget->inherits("QGroupBox")) kdDebug(178) << "Widget '" << widgetName << "' (" << childWidget->className() << ") remains unmanaged." << endl; } } diff --git a/kdecore/kglobalsettings.cpp b/kdecore/kglobalsettings.cpp index 60f09fadb..5d6987550 100644 --- a/kdecore/kglobalsettings.cpp +++ b/kdecore/kglobalsettings.cpp @@ -234,7 +234,7 @@ TQColor KGlobalSettings::activeTextColor() return qt_colorref2qrgb(GetSysColor(COLOR_CAPTIONTEXT)); #else KConfigGroup g( KGlobal::config(), "WM" ); - return g.readColorEntry( "activeForeground", &Qt::white ); + return g.readColorEntry( "activeForeground", tqwhiteptr ); #endif } @@ -255,7 +255,7 @@ TQColor KGlobalSettings::buttonBackground() TQColor KGlobalSettings::buttonTextColor() { KConfigGroup g( KGlobal::config(), "General" ); - return g.readColorEntry( "buttonForeground", &Qt::black ); + return g.readColorEntry( "buttonForeground", tqblackptr ); } // IMPORTANT: @@ -264,7 +264,7 @@ TQColor KGlobalSettings::buttonTextColor() TQColor KGlobalSettings::baseColor() { KConfigGroup g( KGlobal::config(), "General" ); - return g.readColorEntry( "windowBackground", &Qt::white ); + return g.readColorEntry( "windowBackground", tqwhiteptr ); } // IMPORTANT: @@ -273,7 +273,7 @@ TQColor KGlobalSettings::baseColor() TQColor KGlobalSettings::textColor() { KConfigGroup g( KGlobal::config(), "General" ); - return g.readColorEntry( "windowForeground", &Qt::black ); + return g.readColorEntry( "windowForeground", tqblackptr ); } // IMPORTANT: @@ -282,7 +282,7 @@ TQColor KGlobalSettings::textColor() TQColor KGlobalSettings::highlightedTextColor() { KConfigGroup g( KGlobal::config(), "General" ); - return g.readColorEntry( "selectForeground", &Qt::white ); + return g.readColorEntry( "selectForeground", tqwhiteptr ); } // IMPORTANT: diff --git a/kdecore/kkeyserver_x11.h b/kdecore/kkeyserver_x11.h index dbca533e4..7935c0ce4 100644 --- a/kdecore/kkeyserver_x11.h +++ b/kdecore/kkeyserver_x11.h @@ -414,7 +414,7 @@ namespace KKeyServer /** * Converts the Qt-compatible button state to x11 modifier. */ - KDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); + KDECORE_EXPORT int qtButtonStateToMod( TQ_ButtonState s ); /** * Converts the mask of ORed X11 modifiers to -- cgit v1.2.3