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
commitd3aa19ae504bd31477dd42d6e43abf83463657b1 (patch)
treeb7d2ac09aa1197b73de3e6c415908d823be5001f
parent3f0d73536459e2cef4314602e6486d2f9062c150 (diff)
downloadtdewebdev-d3aa19ae.tar.gz
tdewebdev-d3aa19ae.zip
Convert remaining references to kde3 (e.g. in paths) to trinity
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--doc/quanta/config-quanta.docbook2
-rw-r--r--kfilereplace/kfilereplace.kdevelop2
-rw-r--r--kommander/kommander.kdevelop2
-rw-r--r--quanta/README6
-rw-r--r--quanta/data/config/plugins.rc12
-rw-r--r--quanta/quanta.kdevelop10
6 files changed, 17 insertions, 17 deletions
diff --git a/doc/quanta/config-quanta.docbook b/doc/quanta/config-quanta.docbook
index 4f8c9a1f..0b332330 100644
--- a/doc/quanta/config-quanta.docbook
+++ b/doc/quanta/config-quanta.docbook
@@ -114,7 +114,7 @@ The place to define abbreviations (some kind of templates), that can be expanded
<listitem><para><guilabel>Name:</guilabel> the user visible name</para></listitem>
<listitem><para><guilabel>Output window:</guilabel> plugins can appear in a tab of the editor area or in a separate toolview at the bottom</para></listitem>
<listitem><para><guilabel>Location:</guilabel> the path to the plugin, if it is not located in the standard locations, like <filename class="directory">$<envar>KDEDIR</envar>/lib</filename> .</para></listitem>
- <listitem><para><guilabel>File name:</guilabel> the relative path and the filename to the plugin's libtool file, like <filename class="libraryfile">kde3/libcervisiapart.la</filename></para></listitem>
+ <listitem><para><guilabel>File name:</guilabel> the relative path and the filename to the plugin's libtool file, like <filename class="libraryfile">trinity/libcervisiapart.la</filename></para></listitem>
<listitem><para><guilabel>Input:</guilabel> the plugin will get this information on startup, so it can open the <guilabel>Current File</guilabel>, the folder of the current file (<guilabel>Current File Path</guilabel>) or the <guilabel>Project Folder</guilabel>.</para></listitem>
<listitem><para><guilabel>Read only part:</guilabel> check if the plugin refuses to load. Read-only KParts usually refuse to load without this option checked.</para></listitem>
<listitem><para><guilabel>Validate plugin:</guilabel> if checked, &quantaplus; will test if the entered information is correct or not. Uncheck if the plugin is not yet available, but you will install later, so you can close the dialog.</para></listitem>
diff --git a/kfilereplace/kfilereplace.kdevelop b/kfilereplace/kfilereplace.kdevelop
index 96834aae..06c6de76 100644
--- a/kfilereplace/kfilereplace.kdevelop
+++ b/kfilereplace/kfilereplace.kdevelop
@@ -127,7 +127,7 @@
<envvars>
<envvar value="kommander klinkstatus kxsldbg kimagemapeditor quanta" name="DO_NOT_COMPILE" />
</envvars>
- <configargs>--enable-debug=full --prefix=/opt/kde3 --enable-editors</configargs>
+ <configargs>--enable-debug=full --prefix=/opt/trinity --enable-editors</configargs>
<builddir>/home/andris/development/build/kde-head/kdewebdev</builddir>
<topsourcedir>/home/andris/development/sources/kde-head/kdewebdev</topsourcedir>
<cppflags>-DKDE_NO_COMPAT -DQT_NO_COMPAT -DDEBUG_PARSER</cppflags>
diff --git a/kommander/kommander.kdevelop b/kommander/kommander.kdevelop
index f85e7354..fd3ed8c8 100644
--- a/kommander/kommander.kdevelop
+++ b/kommander/kommander.kdevelop
@@ -102,7 +102,7 @@
<kdevdebugger>
<general>
<dbgshell/>
- <programargs>/opt/kde3/bin/DVDAuthorWizard.kmdr</programargs>
+ <programargs>/opt/trinity/bin/DVDAuthorWizard.kmdr</programargs>
<gdbpath/>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
diff --git a/quanta/README b/quanta/README
index 5592bf65..ec364186 100644
--- a/quanta/README
+++ b/quanta/README
@@ -160,17 +160,17 @@ copytos.h:17: forward declaration of `class KURLRequester'
(or the same error in other files for other K... classes), try the following:
- check if there is a kdewidgets.so (and kdewidgets.la) in your
- $KDEDIR/lib/kde3/plugins/designer. If there isn't, you have a broken
+ $KDEDIR/lib/trinity/plugins/designer. If there isn't, you have a broken
KDE (kdelibs) install.
- check your $HOME/.qt/qtrc file. Add the above path as the first entry to
the libraryPath (like:
- libraryPath=/opt/kde-cvs/lib/kde3/plugins/:/home/user/cvs/head/qt-copy/plugins).
+ libraryPath=/opt/kde-cvs/lib/trinity/plugins/:/home/user/cvs/head/qt-copy/plugins).
You can use the qtconfig tool to do this.
- recompile the QT tools (uic, designer) if you have upgraded kdelibs
(or QT).
- check that your $KDEDIR and $QTDIR path is set correctly.
- do an
- export kde_widgetdir="$KDEDIR/lib/kde3/plugins/designer"
+ export kde_widgetdir="$KDEDIR/lib/trinity/plugins/designer"
(or whatever command your shell uses for environment variable setting)
before running make.
In most cases one of the above is the problem (and the solution).
diff --git a/quanta/data/config/plugins.rc b/quanta/data/config/plugins.rc
index 6572e4d5..1a5a5c24 100644
--- a/quanta/data/config/plugins.rc
+++ b/quanta/data/config/plugins.rc
@@ -4,7 +4,7 @@ SearchPaths=
[CVS Management (Cervisia)]
Arguments=
-FileName=kde3/libcervisiapart.la
+FileName=trinity/libcervisiapart.la
Icon=cervisia
Location=
OutputWindow=Editor View
@@ -15,7 +15,7 @@ Input=3
[KFileReplace]
Arguments=
-FileName=kde3/libkfilereplacepart.la
+FileName=trinity/libkfilereplacepart.la
Icon=kfilereplace
Input=3
Location=
@@ -26,7 +26,7 @@ Type=KPart
[XSLT Debugger]
Arguments=
-FileName=kde3/libkxsldbgpart.la
+FileName=trinity/libkxsldbgpart.la
Icon=xsltproc.png
Input=0
Location=
@@ -36,7 +36,7 @@ Standard=false
Type=KPart
[KImageMapEditor]
-FileName=kde3/libkimagemapeditor.la
+FileName=trinity/libkimagemapeditor.la
Icon=kimagemapeditor
Input=1
Location=
@@ -46,7 +46,7 @@ Standard=false
Type=KPart
[Link Checker]
-FileName=kde3/libklinkstatuspart.la
+FileName=trinity/libklinkstatuspart.la
Icon=klinkstatus
Input=1
Location=
@@ -56,7 +56,7 @@ Standard=false
Type=KPart
[Konsole]
-FileName=kde3/libkonsolepart.la
+FileName=trinity/libkonsolepart.la
Icon=konsole
Input=1
Location=
diff --git a/quanta/quanta.kdevelop b/quanta/quanta.kdevelop
index d68df86b..da6c2c61 100644
--- a/quanta/quanta.kdevelop
+++ b/quanta/quanta.kdevelop
@@ -28,7 +28,7 @@
<activetarget>src/quanta</activetarget>
</general>
<configure>
- <configargs>--prefix=/opt/kde3 --enable-debug\s</configargs>
+ <configargs>--prefix=/opt/trinity --enable-debug\s</configargs>
</configure>
<make>
<abortonerror>true</abortonerror>
@@ -92,7 +92,7 @@
</envvars>
</default>
<withkommander>
- <configargs>--enable-debug=full --prefix=/opt/kde3</configargs>
+ <configargs>--enable-debug=full --prefix=/opt/trinity</configargs>
<builddir>/data/development/build/kde-head/kdewebdev</builddir>
<topsourcedir/>
<ccompiler>kdevgccoptions</ccompiler>
@@ -108,7 +108,7 @@
<ldflags/>
</withkommander>
<all>
- <configargs>--enable-debug=full --prefix=/opt/kde3 --enable-editors</configargs>
+ <configargs>--enable-debug=full --prefix=/opt/trinity --enable-editors</configargs>
<builddir>/data/development/build/kde-head/kdewebdev</builddir>
<topsourcedir>/data/development/sources/kde-head/kdewebdev</topsourcedir>
<ccompiler>kdevgccoptions</ccompiler>
@@ -124,7 +124,7 @@
<ldflags/>
</all>
<withoutkafka>
- <configargs>--enable-debug=full --without-kommander --without-kafkapart --prefix=/opt/kde3</configargs>
+ <configargs>--enable-debug=full --without-kommander --without-kafkapart --prefix=/opt/trinity</configargs>
<builddir>/data/development/build/kde-head/kdewebdev-simple</builddir>
<topsourcedir/>
<cppflags/>
@@ -140,7 +140,7 @@
<f77flags/>
</withoutkafka>
<final>
- <configargs>--enable-debug=full --without-kommander --prefix=/opt/kde3 --enable-final</configargs>
+ <configargs>--enable-debug=full --without-kommander --prefix=/opt/trinity --enable-final</configargs>
<builddir>/data/development/build/kde-head/kdewebdev-final</builddir>
<topsourcedir>/data/development/sources/kde-head/kdewebdev</topsourcedir>
<cppflags/>