summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2023-11-23 20:38:58 +0900
committerMichele Calgaro <[email protected]>2023-11-24 10:30:35 +0900
commitcf7f8e74af96c15491c49457261a7d0d001250ad (patch)
tree9113585e3f8354db697b3026cef4c91777501c15 /tdecore
parent89c8032171eb722341972a56d0a0c8a003042511 (diff)
downloadtdelibs-cf7f8e74af96c15491c49457261a7d0d001250ad.tar.gz
tdelibs-cf7f8e74af96c15491c49457261a7d0d001250ad.zip
Replace color '#define' strings with actual values
Signed-off-by: Michele Calgaro <[email protected]> (cherry picked from commit 17a8fd0ec28f5efbc658892067bb5602b6a8e44c)
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/tdeapplication.cpp10
-rw-r--r--tdecore/tdeglobalsettings.cpp10
2 files changed, 10 insertions, 10 deletions
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index c13297dc3..069155850 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -2441,13 +2441,13 @@ TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contr
TQColor trinity4VisitedLink( 82, 24, 139 );
TQColor background = config->readColorEntry( "background", &trinity4Background );
- TQColor foreground = config->readColorEntry( "foreground", tqblackptr );
+ TQColor foreground = config->readColorEntry( "foreground", &TQt::black );
TQColor button = config->readColorEntry( "buttonBackground", &trinity4Button );
- TQColor buttonText = config->readColorEntry( "buttonForeground", tqblackptr );
+ TQColor buttonText = config->readColorEntry( "buttonForeground", &TQt::black );
TQColor highlight = config->readColorEntry( "selectBackground", &trinity4Blue );
- TQColor highlightedText = config->readColorEntry( "selectForeground", tqwhiteptr );
- TQColor base = config->readColorEntry( "windowBackground", tqwhiteptr );
- TQColor baseText = config->readColorEntry( "windowForeground", tqblackptr );
+ TQColor highlightedText = config->readColorEntry( "selectForeground", &TQt::white );
+ TQColor base = config->readColorEntry( "windowBackground", &TQt::white );
+ TQColor baseText = config->readColorEntry( "windowForeground", &TQt::black );
TQColor link = config->readColorEntry( "linkColor", &trinity4Link );
TQColor visitedLink = config->readColorEntry( "visitedLinkColor", &trinity4VisitedLink );
diff --git a/tdecore/tdeglobalsettings.cpp b/tdecore/tdeglobalsettings.cpp
index 20a8d3866..82d0cf896 100644
--- a/tdecore/tdeglobalsettings.cpp
+++ b/tdecore/tdeglobalsettings.cpp
@@ -356,7 +356,7 @@ TQColor TDEGlobalSettings::activeTextColor()
return qt_colorref2qrgb(GetSysColor(COLOR_CAPTIONTEXT));
#else
TDEConfigGroup g( TDEGlobal::config(), "WM" );
- return g.readColorEntry( "activeForeground", tqwhiteptr );
+ return g.readColorEntry( "activeForeground", &TQt::white );
#endif
}
@@ -377,7 +377,7 @@ TQColor TDEGlobalSettings::buttonBackground()
TQColor TDEGlobalSettings::buttonTextColor()
{
TDEConfigGroup g( TDEGlobal::config(), "General" );
- return g.readColorEntry( "buttonForeground", tqblackptr );
+ return g.readColorEntry( "buttonForeground", &TQt::black );
}
// IMPORTANT:
@@ -386,7 +386,7 @@ TQColor TDEGlobalSettings::buttonTextColor()
TQColor TDEGlobalSettings::baseColor()
{
TDEConfigGroup g( TDEGlobal::config(), "General" );
- return g.readColorEntry( "windowBackground", tqwhiteptr );
+ return g.readColorEntry( "windowBackground", &TQt::white );
}
// IMPORTANT:
@@ -395,7 +395,7 @@ TQColor TDEGlobalSettings::baseColor()
TQColor TDEGlobalSettings::textColor()
{
TDEConfigGroup g( TDEGlobal::config(), "General" );
- return g.readColorEntry( "windowForeground", tqblackptr );
+ return g.readColorEntry( "windowForeground", &TQt::black );
}
// IMPORTANT:
@@ -404,7 +404,7 @@ TQColor TDEGlobalSettings::textColor()
TQColor TDEGlobalSettings::highlightedTextColor()
{
TDEConfigGroup g( TDEGlobal::config(), "General" );
- return g.readColorEntry( "selectForeground", tqwhiteptr );
+ return g.readColorEntry( "selectForeground", &TQt::white );
}
// IMPORTANT: