diff options
Diffstat (limited to 'kdecore')
| -rw-r--r-- | kdecore/kapplication.cpp | 26 | ||||
| -rw-r--r-- | kdecore/kcrash.cpp | 2 | ||||
| -rw-r--r-- | kdecore/kglobalsettings.cpp | 10 | ||||
| -rw-r--r-- | kdecore/kglobalsettings.h | 2 | ||||
| -rw-r--r-- | kdecore/kstandarddirs.cpp | 4 | ||||
| -rw-r--r-- | kdecore/ksycocaentry.h | 2 | ||||
| -rw-r--r-- | kdecore/tests/testqtargs.cpp | 4 |
7 files changed, 25 insertions, 25 deletions
diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp index 05afb3054..2583728e2 100644 --- a/kdecore/kapplication.cpp +++ b/kdecore/kapplication.cpp @@ -1327,7 +1327,7 @@ static void checkRestartVersion( TQSessionManager& sm ) } } } - TQString wrapper = KStandardDirs::findExe( "kde3" ); + TQString wrapper = KStandardDirs::findExe( "trinity" ); TQStringList restartCommand = sm.restartCommand(); restartCommand.prepend( wrapper ); sm.setRestartCommand( restartCommand ); @@ -2312,28 +2312,28 @@ TQPalette KApplication::createApplicationPalette() TQPalette KApplication::createApplicationPalette( KConfig *config, int contrast_ ) { - TQColor kde34Background( 239, 239, 239 ); - TQColor kde34Blue( 103,141,178 ); + TQColor trinity4Background( 239, 239, 239 ); + TQColor trinity4Blue( 103,141,178 ); - TQColor kde34Button; + TQColor trinity4Button; if ( TQPixmap::defaultDepth() > 8 ) - kde34Button.setRgb( 221, 223, 228 ); + trinity4Button.setRgb( 221, 223, 228 ); else - kde34Button.setRgb( 220, 220, 220 ); + trinity4Button.setRgb( 220, 220, 220 ); - TQColor kde34Link( 0, 0, 238 ); - TQColor kde34VisitedLink( 82, 24, 139 ); + TQColor trinity4Link( 0, 0, 238 ); + TQColor trinity4VisitedLink( 82, 24, 139 ); - TQColor background = config->readColorEntry( "background", &kde34Background ); + TQColor background = config->readColorEntry( "background", &trinity4Background ); TQColor foreground = config->readColorEntry( "foreground", tqblackptr ); - TQColor button = config->readColorEntry( "buttonBackground", &kde34Button ); + TQColor button = config->readColorEntry( "buttonBackground", &trinity4Button ); TQColor buttonText = config->readColorEntry( "buttonForeground", tqblackptr ); - TQColor highlight = config->readColorEntry( "selectBackground", &kde34Blue ); + 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 link = config->readColorEntry( "linkColor", &kde34Link ); - TQColor visitedLink = config->readColorEntry( "visitedLinkColor", &kde34VisitedLink ); + TQColor link = config->readColorEntry( "linkColor", &trinity4Link ); + TQColor visitedLink = config->readColorEntry( "visitedLinkColor", &trinity4VisitedLink ); int highlightVal, lowlightVal; highlightVal = 100 + (2*contrast_+4)*16/10; diff --git a/kdecore/kcrash.cpp b/kdecore/kcrash.cpp index 5642500f8..dd758f034 100644 --- a/kdecore/kcrash.cpp +++ b/kdecore/kcrash.cpp @@ -441,7 +441,7 @@ static int openSocket() if (!kde_home || !kde_home[0]) { - kde_home = "~/.kde3/"; + kde_home = "~/.trinity/"; } if (kde_home[0] == '~') diff --git a/kdecore/kglobalsettings.cpp b/kdecore/kglobalsettings.cpp index f78377cfe..6d2a487d4 100644 --- a/kdecore/kglobalsettings.cpp +++ b/kdecore/kglobalsettings.cpp @@ -69,7 +69,7 @@ TQFont *KGlobalSettings::_menuFont = 0; TQFont *KGlobalSettings::_windowTitleFont = 0; TQFont *KGlobalSettings::_taskbarFont = 0; TQFont *KGlobalSettings::_largeFont = 0; -TQColor *KGlobalSettings::_kde34Blue = 0; +TQColor *KGlobalSettings::_trinity4Blue = 0; TQColor *KGlobalSettings::_inactiveBackground = 0; TQColor *KGlobalSettings::_inactiveForeground = 0; TQColor *KGlobalSettings::_activeBackground = 0; @@ -194,7 +194,7 @@ TQColor KGlobalSettings::toolBarHighlightColor() { initColors(); KConfigGroup g( KGlobal::config(), "Toolbar style" ); - return g.readColorEntry("HighlightColor", _kde34Blue); + return g.readColorEntry("HighlightColor", _trinity4Blue); } TQColor KGlobalSettings::inactiveTitleColor() @@ -566,11 +566,11 @@ void KGlobalSettings::initStatic() // should be called initPaths(). Don't put an void KGlobalSettings::initColors() { - if (!_kde34Blue) { + if (!_trinity4Blue) { if (TQPixmap::defaultDepth() > 8) - _kde34Blue = new TQColor(103,141,178); + _trinity4Blue = new TQColor(103,141,178); else - _kde34Blue = new TQColor(0, 0, 192); + _trinity4Blue = new TQColor(0, 0, 192); } if (!alternateColor) alternateColor = new TQColor(237, 244, 249); diff --git a/kdecore/kglobalsettings.h b/kdecore/kglobalsettings.h index 4925fd098..07a6f2ccb 100644 --- a/kdecore/kglobalsettings.h +++ b/kdecore/kglobalsettings.h @@ -567,7 +567,7 @@ private: static TQFont *_windowTitleFont; static TQFont *_taskbarFont; static TQFont *_largeFont; - static TQColor * _kde34Blue; + static TQColor * _trinity4Blue; static TQColor * _inactiveBackground; static TQColor * _inactiveForeground; static TQColor * _activeBackground; diff --git a/kdecore/kstandarddirs.cpp b/kdecore/kstandarddirs.cpp index 8d990dc7d..87a509e13 100644 --- a/kdecore/kstandarddirs.cpp +++ b/kdecore/kstandarddirs.cpp @@ -1062,9 +1062,9 @@ TQString KStandardDirs::kde_default(const char *type) { if (!strcmp(type, "lib")) return "lib" KDELIBSUFF "/"; if (!strcmp(type, "module")) - return "lib" KDELIBSUFF "/kde3/"; + return "lib" KDELIBSUFF "/trinity/"; if (!strcmp(type, "qtplugins")) - return "lib" KDELIBSUFF "/kde3/plugins"; + return "lib" KDELIBSUFF "/trinity/plugins"; if (!strcmp(type, "xdgdata-apps")) return "applications/"; if (!strcmp(type, "xdgdata-icon")) diff --git a/kdecore/ksycocaentry.h b/kdecore/ksycocaentry.h index 1d5f1845a..5e3fa2d37 100644 --- a/kdecore/ksycocaentry.h +++ b/kdecore/ksycocaentry.h @@ -32,7 +32,7 @@ class TQDataStream; * the common functionality for servicetypes and services. * * @internal - * @see http://developer.kde.org/documentation/library/kdeqt/kde3arch/ksycoca.html + * @see http://developer.kde.org/documentation/library/kdeqt/trinityarch/ksycoca.html */ class KDECORE_EXPORT KSycocaEntry : public KShared { diff --git a/kdecore/tests/testqtargs.cpp b/kdecore/tests/testqtargs.cpp index 2b3606a59..3853bc035 100644 --- a/kdecore/tests/testqtargs.cpp +++ b/kdecore/tests/testqtargs.cpp @@ -4,8 +4,8 @@ I used the following compile options: g++ -g -Wall -o testqtargs testqtargs.cpp -I/usr/X11R6/include \ - -I/opt/qt3/include -I/opt/kde3/include -L/usr/X11R6/lib -L/opt/qt3/lib \ - -L/opt/kde3/lib -lqt -lkdecore + -I/opt/qt3/include -I/opt/trinity/include -L/usr/X11R6/lib -L/opt/qt3/lib \ + -L/opt/trinity/lib -lqt -lkdecore if invoked like this ./testqtargs --bg blue --caption something --hello hi |