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

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

10 files changed, 13 insertions, 13 deletions

diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index aad75704b..2a9085b97 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -737,7 +737,7 @@ void KColorScheme::readScheme( int index )
     KConfigBase* config;
 
     TQColor widget(239, 239, 239);
-    TQColor kde34Blue(103,141,178);
+    TQColor trinity4Blue(103,141,178);
     TQColor inactiveBackground(157,170,186);
     TQColor activeBackground(65,142,220);
     TQColor inactiveForeground(221,221,221);
@@ -761,7 +761,7 @@ void KColorScheme::readScheme( int index )
       sCurrentScheme  = "<default>";
       cs->txt         = black;
       cs->back        = widget;
-      cs->select      = kde34Blue;
+      cs->select      = trinity4Blue;
       cs->selectTxt   = white;
       cs->window      = white;
       cs->windowTxt   = black;
@@ -810,7 +810,7 @@ void KColorScheme::readScheme( int index )
     // note: defaults should be the same as the KDE default
     cs->txt = config->readColorEntry( "foreground", &black );
     cs->back = config->readColorEntry( "background", &widget );
-    cs->select = config->readColorEntry( "selectBackground", &kde34Blue );
+    cs->select = config->readColorEntry( "selectBackground", &trinity4Blue );
     cs->selectTxt = config->readColorEntry( "selectForeground", &white );
     cs->window = config->readColorEntry( "windowBackground", &white );
     cs->windowTxt = config->readColorEntry( "windowForeground", &black );
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.upd b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.upd
index 61d11999d..068781448 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.upd
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.upd
@@ -1,4 +1,4 @@
-Id=post-kde3.1/cvs
+Id=post-trinity.1/cvs
 File=kuriikwsfilterrc
 Group=General
 Key=SearchEngineShortcutsEnabled,EnableWebShortcuts
diff --git a/kcontrol/input/mouse_cursor_theme.upd b/kcontrol/input/mouse_cursor_theme.upd
index da71abb19..1025f3750 100644
--- a/kcontrol/input/mouse_cursor_theme.upd
+++ b/kcontrol/input/mouse_cursor_theme.upd
@@ -1,4 +1,4 @@
-Id=kde3.4.99
+Id=trinity.4.99
 File=kdeglobals,kcminputrc
 Group=KDE,Mouse
 Options=overwrite
diff --git a/kcontrol/keys/CMakeLists.txt b/kcontrol/keys/CMakeLists.txt
index 7921f0e84..219fb03a5 100644
--- a/kcontrol/keys/CMakeLists.txt
+++ b/kcontrol/keys/CMakeLists.txt
@@ -27,7 +27,7 @@ install( FILES kaccel.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 install( PROGRAMS convertShortcuts.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
 install( FILES
-    wm3.kksrc kde3.kksrc kde4.kksrc win3.kksrc
+    wm3.kksrc trinity.kksrc kde4.kksrc win3.kksrc
     win4.kksrc mac4.kksrc unix3.kksrc
   DESTINATION ${DATA_INSTALL_DIR}/kcmkeys )
 
diff --git a/kcontrol/keys/Makefile.am b/kcontrol/keys/Makefile.am
index ec706a7b1..1af35102e 100644
--- a/kcontrol/keys/Makefile.am
+++ b/kcontrol/keys/Makefile.am
@@ -18,5 +18,5 @@ updatedir = $(kde_datadir)/kconf_update
 
 xdg_apps_DATA = keys.desktop
 
-scheme_DATA = wm3.kksrc kde3.kksrc kde4.kksrc win3.kksrc win4.kksrc mac4.kksrc unix3.kksrc
+scheme_DATA = wm3.kksrc trinity.kksrc kde4.kksrc win3.kksrc win4.kksrc mac4.kksrc unix3.kksrc
 schemedir = $(kde_datadir)/kcmkeys
diff --git a/kcontrol/keys/kaccel.upd b/kcontrol/keys/kaccel.upd
index 711919cdb..f127390a4 100644
--- a/kcontrol/keys/kaccel.upd
+++ b/kcontrol/keys/kaccel.upd
@@ -1,3 +1,3 @@
-Id=kde3.3/r1
+Id=trinity.3/r1
 File=kdeglobals
 Script=convertShortcuts.pl,perl
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 5af8c74f0..5845cff8f 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -428,7 +428,7 @@ void KKeyModule::readScheme( int index )
 {
   TQStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc");
   //TQRegExp r( "-kde[34].kksrc$" );
-  TQRegExp r( "-kde3.kksrc$" );
+  TQRegExp r( "-trinity.kksrc$" );
 
   sList->clear();
   sFileList->clear();
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index 931d2267d..68c43365e 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -177,7 +177,7 @@ void ShortcutsModule::initGUI()
 	m_pTab->setMargin( KDialog::marginHint() );
 	pVLayout->addWidget( m_pTab );
 
-	// See if ~/.kde3/env/win-key.sh exists
+	// See if ~/.trinity/env/win-key.sh exists
 	TQFile f( kde_winkeys_env_dir + "win-key.sh" );
 	if ( f.exists() == false ) {
 		// No, it does not, so Win is a modifier
@@ -460,7 +460,7 @@ void ShortcutsModule::slotUseRmWinKeysClicked()
 {
 	TQString kde_winkeys_env_dir = KGlobal::dirs()->localkdedir() + "/env/";
 
-	// See if ~/.kde3/env/win-key.sh exists
+	// See if ~/.trinity/env/win-key.sh exists
 	TQFile f( kde_winkeys_env_dir + "win-key.sh" );
 	if ( f.exists() == false ) {
 		// No, it does not, so Win is currently a modifier
diff --git a/kcontrol/kio/socks.upd b/kcontrol/kio/socks.upd
index ed0383275..3b8bfd7f9 100644
--- a/kcontrol/kio/socks.upd
+++ b/kcontrol/kio/socks.upd
@@ -1,5 +1,5 @@
 # Hello world
-Id=kde3.0/r1
+Id=trinity.0/r1
 File=ksocksrc,kdeglobals
 Group=<default>,Socks
 Key=Custom Lib,SOCKS_lib
diff --git a/kcontrol/krdb/kcmdisplayrc.upd b/kcontrol/krdb/kcmdisplayrc.upd
index 4d139ad2c..9149697ce 100644
--- a/kcontrol/krdb/kcmdisplayrc.upd
+++ b/kcontrol/krdb/kcmdisplayrc.upd
@@ -1,5 +1,5 @@
 # This is comment
-Id=kde3
+Id=trinity
 File=kcmdisplayrc
 Group=X11
 Options=copy