diff options
Diffstat (limited to 'tdecore')
| -rw-r--r-- | tdecore/kapplication.cpp | 26 | ||||
| -rw-r--r-- | tdecore/kapplication.h | 14 | ||||
| -rw-r--r-- | tdecore/kglobalsettings.cpp | 8 | ||||
| -rw-r--r-- | tdecore/tests/kipctest.cpp | 6 |
4 files changed, 27 insertions, 27 deletions
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp index 35ece3c25..968664bad 100644 --- a/tdecore/kapplication.cpp +++ b/tdecore/kapplication.cpp @@ -953,9 +953,9 @@ void TDEApplication::init(bool GUIenabled) } } - kdisplaySetStyle(); - kdisplaySetFont(); -// kdisplaySetPalette(); done by kdisplaySetStyle + tdedisplaySetStyle(); + tdedisplaySetFont(); +// tdedisplaySetPalette(); done by tdedisplaySetStyle propagateSettings(SETTINGS_QT); // Set default mime-source factory @@ -2124,7 +2124,7 @@ bool TDEApplication::x11EventFilter( XEvent *_event ) { case KIPC::StyleChanged: TDEGlobal::config()->reparseConfiguration(); - kdisplaySetStyle(); + tdedisplaySetStyle(); break; case KIPC::ToolbarStyleChanged: @@ -2135,13 +2135,13 @@ bool TDEApplication::x11EventFilter( XEvent *_event ) case KIPC::PaletteChanged: TDEGlobal::config()->reparseConfiguration(); - kdisplaySetPalette(); + tdedisplaySetPalette(); break; case KIPC::FontChanged: TDEGlobal::config()->reparseConfiguration(); TDEGlobalSettings::rereadFontSettings(); - kdisplaySetFont(); + tdedisplaySetFont(); break; case KIPC::BackgroundChanged: @@ -2296,7 +2296,7 @@ void TDEApplication::applyGUIStyle() else setStyle(d->overrideStyle); // Reread palette from config file. - kdisplaySetPalette(); + tdedisplaySetPalette(); } TQString TDEApplication::caption() const @@ -2435,7 +2435,7 @@ TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contr } -void TDEApplication::kdisplaySetPalette() +void TDEApplication::tdedisplaySetPalette() { #ifdef Q_WS_MACX //Can I have this on other platforms, please!? --Sam @@ -2448,12 +2448,12 @@ void TDEApplication::kdisplaySetPalette() } #endif TQApplication::setPalette( createApplicationPalette(), true); - emit kdisplayPaletteChanged(); + emit tdedisplayPaletteChanged(); emit appearanceChanged(); } -void TDEApplication::kdisplaySetFont() +void TDEApplication::tdedisplaySetFont() { TQApplication::setFont(TDEGlobalSettings::generalFont(), true); TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING); @@ -2466,17 +2466,17 @@ void TDEApplication::kdisplaySetFont() sheet->item ("code")->setFontFamily (TDEGlobalSettings::fixedFont().family()); sheet->item ("tt")->setFontFamily (TDEGlobalSettings::fixedFont().family()); - emit kdisplayFontChanged(); + emit tdedisplayFontChanged(); emit appearanceChanged(); } -void TDEApplication::kdisplaySetStyle() +void TDEApplication::tdedisplaySetStyle() { if (useStyles) { applyGUIStyle(); - emit kdisplayStyleChanged(); + emit tdedisplayStyleChanged(); emit appearanceChanged(); } } diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h index f59c307eb..4b29dd94c 100644 --- a/tdecore/kapplication.h +++ b/tdecore/kapplication.h @@ -1406,7 +1406,7 @@ signals: * Normally, widgets will update their palette automatically, but you * should connect to this to program special behavior. */ - void kdisplayPaletteChanged(); + void tdedisplayPaletteChanged(); /** * Emitted when TDEApplication has changed its GUI style in response to a KControl request. @@ -1415,7 +1415,7 @@ signals: * respond to an explicit setGUIStyle() call), but you should connect to * this to program special behavior. */ - void kdisplayStyleChanged(); + void tdedisplayStyleChanged(); /** * Emitted when TDEApplication has changed its font in response to a KControl request. @@ -1428,11 +1428,11 @@ signals: * reimplement TQWidget::fontChange(). This is the preferred way * to get informed about font updates. */ - void kdisplayFontChanged(); + void tdedisplayFontChanged(); /** * Emitted when TDEApplication has changed either its GUI style, its font or its palette - * in response to a kdisplay request. Normally, widgets will update their styles + * in response to a tdedisplay request. Normally, widgets will update their styles * automatically, but you should connect to this to program special * behavior. */ void appearanceChanged(); @@ -1528,9 +1528,9 @@ signals: private: void propagateSettings(SettingsCategory category); - void kdisplaySetPalette(); - void kdisplaySetStyle(); - void kdisplaySetFont(); + void tdedisplaySetPalette(); + void tdedisplaySetStyle(); + void tdedisplaySetFont(); void applyGUIStyle(); static void sigpipeHandler(int); diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp index 27ba7743e..d7006b37a 100644 --- a/tdecore/kglobalsettings.cpp +++ b/tdecore/kglobalsettings.cpp @@ -266,7 +266,7 @@ TQColor TDEGlobalSettings::buttonTextColor() // IMPORTANT: // This function should be kept in sync with -// TDEApplication::kdisplaySetPalette() +// TDEApplication::tdedisplaySetPalette() TQColor TDEGlobalSettings::baseColor() { TDEConfigGroup g( TDEGlobal::config(), "General" ); @@ -275,7 +275,7 @@ TQColor TDEGlobalSettings::baseColor() // IMPORTANT: // This function should be kept in sync with -// TDEApplication::kdisplaySetPalette() +// TDEApplication::tdedisplaySetPalette() TQColor TDEGlobalSettings::textColor() { TDEConfigGroup g( TDEGlobal::config(), "General" ); @@ -284,7 +284,7 @@ TQColor TDEGlobalSettings::textColor() // IMPORTANT: // This function should be kept in sync with -// TDEApplication::kdisplaySetPalette() +// TDEApplication::tdedisplaySetPalette() TQColor TDEGlobalSettings::highlightedTextColor() { TDEConfigGroup g( TDEGlobal::config(), "General" ); @@ -293,7 +293,7 @@ TQColor TDEGlobalSettings::highlightedTextColor() // IMPORTANT: // This function should be kept in sync with -// TDEApplication::kdisplaySetPalette() +// TDEApplication::tdedisplaySetPalette() TQColor TDEGlobalSettings::highlightColor() { initColors(); diff --git a/tdecore/tests/kipctest.cpp b/tdecore/tests/kipctest.cpp index 0f33714b3..d6cff80e3 100644 --- a/tdecore/tests/kipctest.cpp +++ b/tdecore/tests/kipctest.cpp @@ -8,9 +8,9 @@ MyObject::MyObject() : TQObject(0L, "testobj") { - connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(slotPaletteChanged())); - connect(kapp, TQT_SIGNAL(kdisplayFontChanged()), TQT_SLOT(slotFontChanged())); - connect(kapp, TQT_SIGNAL(kdisplayStyleChanged()), TQT_SLOT(slotStyleChanged())); + connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(slotPaletteChanged())); + connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), TQT_SLOT(slotFontChanged())); + connect(kapp, TQT_SIGNAL(tdedisplayStyleChanged()), TQT_SLOT(slotStyleChanged())); connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int))); connect(kapp, TQT_SIGNAL(appearanceChanged()), TQT_SLOT(slotAppearanceChanged())); connect(kapp, TQT_SIGNAL(kipcMessage(int,int)), TQT_SLOT(slotMessage(int,int))); |