summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-21 01:43:11 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-21 01:43:11 +0000
commit452dc1bc85da499f67d6cacd130263377552c631 (patch)
treebd859131120b044fd19fcb847e18a2e74ee9a923
parent25a5b3950e013d67b68f091cdfac27eb1ad0debc (diff)
downloadtdelibs-452dc1bc85da499f67d6cacd130263377552c631.tar.gz
tdelibs-452dc1bc85da499f67d6cacd130263377552c631.zip
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
-rw-r--r--COMPILING2
-rw-r--r--COMPILING.html2
-rw-r--r--NAMING2
-rw-r--r--kdecore/kapplication.cpp26
-rw-r--r--kdecore/kcrash.cpp2
-rw-r--r--kdecore/kglobalsettings.cpp10
-rw-r--r--kdecore/kglobalsettings.h2
-rw-r--r--kdecore/kstandarddirs.cpp4
-rw-r--r--kdecore/ksycocaentry.h2
-rw-r--r--kdecore/tests/testqtargs.cpp4
-rw-r--r--kded/kded.upd2
-rw-r--r--kdeprint/cups/kmcupsmanager.cpp2
-rw-r--r--kdeui/kdepackages.h2
-rw-r--r--kdewidgets/README2
-rw-r--r--kdoctools/kio_help.upd2
-rw-r--r--khtml/DESIGN.html2
-rw-r--r--khtml/kmultipart/Makefile.am2
-rw-r--r--kinit/autostart.cpp2
-rw-r--r--kinit/kstartupconfig.cpp2
-rw-r--r--kinit/lnusertemp.c2
-rw-r--r--kinit/wrapper.c2
-rw-r--r--kio/kfile/knotifydialog.cpp2
-rw-r--r--kio/kssl/kopenssl.cc2
-rw-r--r--kio/tests/jobtest.cpp2
-rw-r--r--kioslave/http/kcookiejar/kcookiescfg.upd2
-rw-r--r--kmdi/test/README2
-rw-r--r--kparts/tests/Makefile.am2
-rw-r--r--libltdl/ltdl_win.c6
-rw-r--r--win/common.pro16
-rw-r--r--win/pro_files/kate/part/part.pro2
-rw-r--r--win/pro_files/kdewidgets/kdewidgets.pro4
-rw-r--r--win/pro_files/kioslave/common.pro2
-rw-r--r--win/tools/build_kdelibs_dbg2
33 files changed, 61 insertions, 61 deletions
diff --git a/COMPILING b/COMPILING
index 61313aa0a..c40f507bc 100644
--- a/COMPILING
+++ b/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
diff --git a/COMPILING.html b/COMPILING.html
index 58deb391b..eb288a7d1 100644
--- a/COMPILING.html
+++ b/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>
diff --git a/NAMING b/NAMING
index cd3c5ae80..7ffa27381 100644
--- a/NAMING
+++ b/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.
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
diff --git a/kded/kded.upd b/kded/kded.upd
index 16cd23757..4523a1bb4 100644
--- a/kded/kded.upd
+++ b/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
diff --git a/kdeprint/cups/kmcupsmanager.cpp b/kdeprint/cups/kmcupsmanager.cpp
index 6dd1f32d5..3027f3ac7 100644
--- a/kdeprint/cups/kmcupsmanager.cpp
+++ b/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()
diff --git a/kdeui/kdepackages.h b/kdeui/kdepackages.h
index f1d7ac284..bda1788b5 100644
--- a/kdeui/kdepackages.h
+++ b/kdeui/kdepackages.h
@@ -1253,7 +1253,7 @@ const char * const packages[] = {
"step/stepcore",
"superkaramba",
"sweeper",
-"systemsettings-kde3",
+"systemsettings-trinity",
"systemsettings",
"systemsettings/accessibility",
"systemsettings/autostart",
diff --git a/kdewidgets/README b/kdewidgets/README
index eaa3de347..a69dcfe91 100644
--- a/kdewidgets/README
+++ b/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> .
diff --git a/kdoctools/kio_help.upd b/kdoctools/kio_help.upd
index 2b83f05e9..c8826bc2b 100644
--- a/kdoctools/kio_help.upd
+++ b/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
diff --git a/khtml/DESIGN.html b/khtml/DESIGN.html
index ea7f73439..b6419c891 100644
--- a/khtml/DESIGN.html
+++ b/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
diff --git a/khtml/kmultipart/Makefile.am b/khtml/kmultipart/Makefile.am
index b6d6af0df..9cdae7168 100644
--- a/khtml/kmultipart/Makefile.am
+++ b/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
diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
index 8fba76928..334bfa543 100644
--- a/kinit/autostart.cpp
+++ b/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();
diff --git a/kinit/kstartupconfig.cpp b/kinit/kstartupconfig.cpp
index 0700f22fc..043125976 100644
--- a/kinit/kstartupconfig.cpp
+++ b/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;
diff --git a/kinit/lnusertemp.c b/kinit/lnusertemp.c
index fdbf8ae0b..31a8afd87 100644
--- a/kinit/lnusertemp.c
+++ b/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] == '~')
diff --git a/kinit/wrapper.c b/kinit/wrapper.c
index 8fe16892b..15aa2bbf6 100644
--- a/kinit/wrapper.c
+++ b/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] == '~')
diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp
index 796144795..0b31dc8c0 100644
--- a/kio/kfile/knotifydialog.cpp
+++ b/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;
diff --git a/kio/kssl/kopenssl.cc b/kio/kssl/kopenssl.cc
index 70d36cd8e..9509764c9 100644
--- a/kio/kssl/kopenssl.cc
+++ b/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"
diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp
index ecd351a08..3cd33a8f8 100644
--- a/kio/tests/jobtest.cpp
+++ b/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" );
diff --git a/kioslave/http/kcookiejar/kcookiescfg.upd b/kioslave/http/kcookiejar/kcookiescfg.upd
index 3c1cd028d..0ff26bde0 100644
--- a/kioslave/http/kcookiejar/kcookiescfg.upd
+++ b/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
diff --git a/kmdi/test/README b/kmdi/test/README
index 0cdeae7ef..7c796b4c2 100644
--- a/kmdi/test/README
+++ b/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).
diff --git a/kparts/tests/Makefile.am b/kparts/tests/Makefile.am
index 8474e1132..e593cb6da 100644
--- a/kparts/tests/Makefile.am
+++ b/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
diff --git a/libltdl/ltdl_win.c b/libltdl/ltdl_win.c
index 5a75b38be..a7fae0ded 100644
--- a/libltdl/ltdl_win.c
+++ b/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_TO = "c:/kde/lib/kde3";
+ static const char* WIN32_LIBDIR_FROM = "/opt/trinity/lib/trinity";
+ 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);
diff --git a/win/common.pro b/win/common.pro
index 669d22d62..2e7837a82 100644
--- a/win/common.pro
+++ b/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)
- contains( CONFIG, kde3lib ) {
- DESTDIR = $$KDEBINDESTDIR/lib/kde3
+ # lib/trinity dest dir (for modules)
+ contains( CONFIG, trinitylib ) {
+ 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) {
diff --git a/win/pro_files/kate/part/part.pro b/win/pro_files/kate/part/part.pro
index 82a9aa046..46edc6508 100644
--- a/win/pro_files/kate/part/part.pro
+++ b/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 )
diff --git a/win/pro_files/kdewidgets/kdewidgets.pro b/win/pro_files/kdewidgets/kdewidgets.pro
index 1458bf323..e56eaba06 100644
--- a/win/pro_files/kdewidgets/kdewidgets.pro
+++ b/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 \
diff --git a/win/pro_files/kioslave/common.pro b/win/pro_files/kioslave/common.pro
index 2bb1361f7..35fbaf5d9 100644
--- a/win/pro_files/kioslave/common.pro
+++ b/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 )
diff --git a/win/tools/build_kdelibs_dbg b/win/tools/build_kdelibs_dbg
index 6b9aaed38..ca46d6865 100644
--- a/win/tools/build_kdelibs_dbg
+++ b/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