TDE
/
tdelibs
7
1
Fork 0
Code Issues 16 Pull Requests 8 Releases Wiki Activity

Rename kdisplay for enhanced compatibility with KDE4

Browse Source
pull/16/head
Timothy Pearson 11 years ago
parent f8d95a0242
commit e92a4e05c5
8 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File

2
kstyles/asteroid/asteroid.cpp
Unescape View File

@ -94,7 +94,7 @@ TQ_EXPORT_PLUGIN(AsteroidStylePlugin);
AsteroidStyle::AsteroidStyle() : KStyle(AllowMenuTransparency)
{
if (tqApp->inherits("TDEApplication")) {
connect(tqApp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
connect(tqApp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
}
backwards = TQApplication::reverseLayout();

26
tdecore/kapplication.cpp
Unescape View File

@ -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();
}
}

14
tdecore/kapplication.h
Unescape View File

@ -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);

8
tdecore/kglobalsettings.cpp
Unescape View File

@ -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();

6
tdecore/tests/kipctest.cpp
Unescape View File

@ -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)));

2
tdehtml/tdehtmlview.cpp
Unescape View File

@ -493,7 +493,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
d = new TDEHTMLViewPrivate;
TQScrollView::setVScrollBarMode(d->vmode);
TQScrollView::setHScrollBarMode(d->hmode);
connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), this, TQT_SLOT(slotPaletteChanged()));
connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(slotPaletteChanged()));
connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotScrollBarMoved()));
// initialize QScrollView

2
tdeui/kactivelabel.cpp
Unescape View File

@ -51,7 +51,7 @@ void KActiveLabel::init()
this, TQT_SLOT(openLink(const TQString &)));
if (kapp)
{
connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()),
connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
this, TQT_SLOT(paletteChanged()));
}
}

2
tdeui/kjanuswidget.cpp
Unescape View File

@ -197,7 +197,7 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face )
}
if ( kapp )
connect(kapp,TQT_SIGNAL(kdisplayFontChanged()),TQT_SLOT(slotFontChanged()));
connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged()));
mValid = true;
setSwallowedWidget(0); // Set default size if 'mFace' is Swallow.

Write Preview
Loading…
Cancel
Save