Convert remaining references to kde3 (e.g. in paths) to trinity

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

COMPILING

@@ -60,7 +60,7 @@ ldconfig -m $QTDIR/lib
 
 You probably also want to add $KDEDIR/bin and $QTDIR/bin to your path.
 
-See http://www.kde.org/kde2-and-kde3.html for tips about setting up
+See http://www.kde.org/kde2-and-trinity.html for tips about setting up
 KDE 3.0 next to KDE 2.x.
 
 Compiling

COMPILING.html

@@ -55,7 +55,7 @@ ldconfig -m $QTDIR/lib</pre>
 
 <p>You probably also want to add $KDEDIR/bin and $QTDIR/bin to your path.
 
-<p>See http://www.kde.org/kde2-and-kde3.html for tips about setting up
+<p>See http://www.kde.org/kde2-and-trinity.html for tips about setting up
 KDE 3.0 next to KDE 2.x.
 
 <p><h3>Preparing CVS modules</h3>

NAMING

@@ -71,5 +71,5 @@ LDFLAGS: -module $(KDE_PLUGIN)
 
 A definition like kde_module_LTLIBRARIES = <Name>
 means that the module is installed under $(kde_moduledir),
-which is $prefix/lib/kde3/ in KDE3.
+which is $prefix/lib/trinity/ in KDE3.
 

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 trinity4Background( 239, 239, 239 );
-    TQColor kde34Blue( 103,141,178 );
+    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 trinity4Link( 0, 0, 238 );
-    TQColor kde34VisitedLink( 82, 24, 139 );
+    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 link = config->readColorEntry( "linkColor", &trinity4Link );
-    TQColor visitedLink = config->readColorEntry( "visitedLinkColor", &kde34VisitedLink );
+    TQColor visitedLink = config->readColorEntry( "visitedLinkColor", &trinity4VisitedLink );
 
     int highlightVal, lowlightVal;
     highlightVal = 100 + (2*contrast_+4)*16/10;

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] == '~')

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

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;

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"))

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
 {

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 \
+  -I/opt/qt3/include -I/opt/trinity/include -L/usr/X11R6/lib -L/opt/qt3/lib \
-  -L/opt/kde3/lib -lqt -lkdecore
+  -L/opt/trinity/lib -lqt -lkdecore
 
   if invoked like this ./testqtargs --bg blue --caption something --hello hi
 

kded/kded.upd

@@ -1,5 +1,5 @@
 # Migrating kdirwatch poll interval from kdedrc to kdeglobals
-Id=kde3.0
+Id=trinity.0
 File=kdedrc,kdeglobals
 Group=General,DirWatch
 Key=PollInterval

kdeprint/cups/kmcupsmanager.cpp

@@ -95,7 +95,7 @@ KMCupsManager::~KMCupsManager()
 
 TQString KMCupsManager::driverDbCreationProgram()
 {
-	return TQString::tqfromLatin1("/opt/kde3/bin/make_driver_db_cups");
+	return TQString::tqfromLatin1("/opt/trinity/bin/make_driver_db_cups");
 }
 
 TQString KMCupsManager::driverDirectory()

kdeui/kdepackages.h

@@ -1253,7 +1253,7 @@ const char * const packages[] = {
 "step/stepcore",
 "superkaramba",
 "sweeper",
-"systemsettings-kde3",
+"systemsettings-trinity",
 "systemsettings",
 "systemsettings/accessibility",
 "systemsettings/autostart",

kdewidgets/README

@@ -7,7 +7,7 @@ Summary:
 
 This directory contains KDE custom widgets for designer 2 which comes with
 Qt 3. Just make sure your plugin path in qtconfig includes
-$KDEDIR/lib/kde3/plugins . With the KDE build system nothing special 
+$KDEDIR/lib/trinity/plugins . With the KDE build system nothing special 
 (i.e. editing the plugin path) is needed, as uic will automatically be
 called with -L <path to the kdewidgets plugin> .
 

kdoctools/kio_help.upd

@@ -1,3 +1,3 @@
 # Move kio_help cache from $KDEHOME/share/apps/kio_help/cache to $KDEHOME/cache-$HOST/kio_help
-Id=kde3_2
+Id=trinity_2
 Script=move_kio_help_cache.sh,sh

khtml/DESIGN.html

@@ -174,7 +174,7 @@ not be seen from the outside for various reasons (make implementation of shared
 or to reduce memory consumption).
 <p>
 In C++, you can access the whole DOM tree from outside KHTML by using the interface classes. 
-For a description see the <a href="http://developer.kde.org/documentation/library/kdeqt/kde3arch/khtml/index.html">introduction to khtml</a> on <a href="http://developer.kde.org/">developer.kde.org</a>.
+For a description see the <a href="http://developer.kde.org/documentation/library/kdeqt/trinityarch/khtml/index.html">introduction to khtml</a> on <a href="http://developer.kde.org/">developer.kde.org</a>.
 
 One thing that has been omitted in the discussion above is the style sheet defined inside the 
 <code>&lt;style&gt;</code> element (as an example of a style sheet) and the image element 

khtml/kmultipart/Makefile.am

@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/khtml -I$(top_srcdir)/kio/httpfilter -I$(top_srcdir)/kutils $(all_includes)
 
 # These are not really libraries, but modules dynamically opened.
-# So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/kde3
+# So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/trinity
 kde_module_LTLIBRARIES = libkmultipart.la
 
 libkmultipart_la_SOURCES = kmultipart.cpp

kinit/autostart.cpp

@@ -136,7 +136,7 @@ AutoStart::loadAutoStartList()
        if (config.readBoolEntry("Hidden", false))
           continue;
 
-       // Check to see if the most important ( usually ~/.config/autostart or ~/.kde3/Autostart) XDG directory
+       // Check to see if the most important ( usually ~/.config/autostart or ~/.trinity/Autostart) XDG directory
        // has overridden the Hidden directive and honor it if set to True
        bool autostartOverriddenAndDisabled = false;
        for(TQStringList::ConstIterator localit = files.begin();

kinit/kstartupconfig.cpp

@@ -81,7 +81,7 @@ int main()
     else if( getenv( "HOME" ))
         {
         strlcpy( kdehome, getenv( "HOME" ), 1024 );
-        strlcat( kdehome, "/.kde3", 1024  );
+        strlcat( kdehome, "/.trinity", 1024  );
         }
     else
         return 1;

kinit/lnusertemp.c

@@ -119,7 +119,7 @@ int build_link(const char *tmp_prefix, const char *kde_prefix, int kdehostname)
 
   if (!kde_home || !kde_home[0])
   {
-     kde_home = "~/.kde3/";
+     kde_home = "~/.trinity/";
   }
 
   if (kde_home[0] == '~')

kinit/wrapper.c

@@ -139,7 +139,7 @@ static int openSocket()
 
   if (!kde_home || !kde_home[0])
   {
-     kde_home = "~/.kde3/";
+     kde_home = "~/.trinity/";
   }
 
   if (kde_home[0] == '~')

kio/kfile/knotifydialog.cpp

@@ -827,7 +827,7 @@ void KNotifyWidget::save()
 }
 
 // returns e.g. "kwin/eventsrc" from a given path
-// "/opt/kde3/share/apps/kwin/eventsrc"
+// "/opt/trinity/share/apps/kwin/eventsrc"
 TQString KNotifyWidget::makeRelative( const TQString& fullPath )
 {
     int slash = fullPath.findRev( '/' ) - 1;

kio/kssl/kopenssl.cc

@@ -297,7 +297,7 @@ KConfig *cfg;
    		<< "/usr/local/bin"             
    		<< "/usr/local/openssl/bin"     
    		<< "/opt/openssl/bin"           
-   		<< "/opt/kde3/bin"              
+   		<< "/opt/trinity/bin"              
    		<< "";                          
                                        
    libnamess << "cygssl-0.9.7.dll"     

kio/tests/jobtest.cpp

@@ -583,7 +583,7 @@ void JobTest::copyFileToSystem( bool resolve_local_urls )
 
     // Check mimetype
     kdDebug() << m_mimetype << endl;
-    // There's no mimemagic determination in kio_file in kde3. Fixing this for kde4...
+    // There's no mimemagic determination in kio_file in trinity. Fixing this for kde4...
     assert( m_mimetype == "application/octet-stream" );
     //assert( m_mimetype == "text/plain" );
 

kioslave/http/kcookiejar/kcookiescfg.upd

@@ -4,7 +4,7 @@ File=kcookiejarrc
 Group=Browser Settings/HTTP,Cookie Policy
 
 # Update cookies config file...
-Id=kde3.1/cvs
+Id=trinity.1/cvs
 File=kcookiejarrc
 Group=<default>,Cookie Dialog
 Key=DefaultRadioButton,PreferredPolicy

kmdi/test/README

@@ -8,7 +8,7 @@ Call
   qmake kFourChildren -o Makefile
   make
 to build the example app.
-Likely you must set the environment variable KDEDIR (to e.g. /opt/kde3).
+Likely you must set the environment variable KDEDIR (to e.g. /opt/trinity).
 
 
 

kparts/tests/Makefile.am

@@ -13,7 +13,7 @@ ghostviewtest_SOURCES = ghostview.cpp
 ghostviewtest_LDADD = $(LIB_KPARTS)
 
 # These are not really libraries, but modules dynamically opened.
-# So they should be installed in kde_module_dir, which is usually $prefix/lib/kde3
+# So they should be installed in kde_module_dir, which is usually $prefix/lib/trinity
 kde_module_LTLIBRARIES = libspellcheckplugin.la libnotepadpart.la
 
 libspellcheckplugin_la_SOURCES = plugin_spellcheck.cpp

libltdl/ltdl_win.c

@@ -68,8 +68,8 @@ static char win32_mapDir_KDEDIR[MAX_PATH] = "";
 // when mapping is performed, frees old name at *dir and allocates new path for *dir 
 void win32_mapDir( char **dir )
 {
-    static const char* WIN32_LIBDIR_FROM = "/opt/kde3/lib/kde3";
+    static const char* WIN32_LIBDIR_FROM = "/opt/trinity/lib/trinity";
-    static const char* WIN32_LIBDIR_TO = "c:/kde/lib/kde3";
+    static const char* WIN32_LIBDIR_TO = "c:/kde/lib/trinity";
     char *e;
 //TODO........
     if (!*win32_mapDir_KDEDIR) {
@@ -78,7 +78,7 @@ void win32_mapDir( char **dir )
         strncpy( win32_mapDir_KDEDIR, e, MAX_PATH );
     }
     assert(dir && *dir && win32_mapDir_KDEDIR && *win32_mapDir_KDEDIR);
-    // /opt/kde3/lib/kde3 -> <letter>:/kde/lib/kde3
+    // /opt/trinity/lib/trinity -> <letter>:/kde/lib/trinity
 
     if (strcmp(*dir, WIN32_LIBDIR_FROM)==0) {
         free(*dir);

win/common.pro

@@ -12,7 +12,7 @@ exists( custom_defs.pro ) {
 }
 
 # common version info for all libs:
-!contains( CONFIG, kde3lib ) {
+!contains( CONFIG, trinitylib ) {
 	VER_MAJ = $(KDE_VER_MAJ)
 	VER_MIN = $(KDE_VER_MIN)
 	VER_PAT = $(KDE_VER_PAT)
@@ -62,10 +62,10 @@ isEmpty( KDEBUG ) {
   }
   !contains(CONFIG,debug) {
 		KDEBUG=_
-		contains(CONFIG,kde3lib) {
+		contains(CONFIG,trinitylib) {
 			KDELIBDEBUG=
 		}
-		!contains(CONFIG,kde3lib) {
+		!contains(CONFIG,trinitylib) {
 			KDELIBDEBUG=_
 		}
 		KDELIBDEBUGLIB=.lib
@@ -101,16 +101,16 @@ contains( TEMPLATE, lib ) {
 	# indicate that we building a library
 	QMAKE_CXXFLAGS += -DKDE_MAKE_LIB=1
 
-	# lib/kde3 dest dir (for modules)
+	# lib/trinity dest dir (for modules)
-	contains( CONFIG, kde3lib ) {
+	contains( CONFIG, trinitylib ) {
-	  DESTDIR = $$KDEBINDESTDIR/lib/kde3
+	  DESTDIR = $$KDEBINDESTDIR/lib/trinity
 	  TARGET_EXT = .dll #- no ver. in filename
 	}
-	!contains( CONFIG, kde3lib ) {
+	!contains( CONFIG, trinitylib ) {
 	  DESTDIR = $$KDELIBDESTDIR
 	}
 	contains( CONFIG, kstyle ) {
-	  DESTDIR = $$KDEBINDESTDIR/lib/kde3/plugins/styles
+	  DESTDIR = $$KDEBINDESTDIR/lib/trinity/plugins/styles
 	  CONFIG += plugin
 	}
 #  !contains(CONFIG,debug) {

win/pro_files/kate/part/part.pro

@@ -1,5 +1,5 @@
 TEMPLATE	= lib
-CONFIG += kde3lib #this is a kde module library
+CONFIG += trinitylib #this is a kde module library
 
 include( $(KDELIBS)/win/common.pro )
 

win/pro_files/kdewidgets/kdewidgets.pro

@@ -1,5 +1,5 @@
 TEMPLATE	= lib
-CONFIG += kde3lib #this is a dynamic kde library
+CONFIG += trinitylib #this is a dynamic kde library
 
 include( $(KDELIBS)/win/common.pro )
 
@@ -9,7 +9,7 @@ system( makekdewidgets -o kdewidgets.cpp kde.widgets )
 
 TARGET = kdewidgets
 
-DESTDIR		= $$KDELIBDESTDIR/kde3/plugins/designer
+DESTDIR		= $$KDELIBDESTDIR/trinity/plugins/designer
 
 LIBS +=  $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \

win/pro_files/kioslave/common.pro

@@ -1,6 +1,6 @@
 TEMPLATE	= lib
 
-CONFIG += kde3lib #this is a dynamic kde library
+CONFIG += trinitylib #this is a dynamic kde library
 
 include( $(KDELIBS)/win/common.pro )
 

win/tools/build_kdelibs_dbg

@@ -73,7 +73,7 @@ qmake makekdewidgets.pro && $make clean && $make || exit 1
 qmake && $make clean && $make || exit 1
 
 # copy kdewidgets plugin for Qt Designer
-cp $KDEDIR/lib/kde3/plugins/designer/kdewidgets.dll $QTDIR/plugins/designer/
+cp $KDEDIR/lib/trinity/plugins/designer/kdewidgets.dll $QTDIR/plugins/designer/
 
 cd $pwd