TDE
/
ktechlab
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/ktechlab
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of libraries and executables to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 3604ea7431
commit 3f4482bc10
25 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File

8
acinclude.m4
Unescape View File

@ -606,7 +606,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$trinity2ornewer"; then if test -n "$trinity2ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$trinity3ornewer"; then if test -n "$trinity3ornewer"; then
@ -1790,7 +1790,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
@ -2090,7 +2090,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2100,7 +2100,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])

8
aclocal.m4 vendored
Unescape View File

@ -618,7 +618,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$trinity2ornewer"; then if test -n "$trinity2ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$trinity3ornewer"; then if test -n "$trinity3ornewer"; then
@ -1802,7 +1802,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
@ -2102,7 +2102,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2112,7 +2112,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])

2
src/canvasmanipulator.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <cmath> #include <cmath>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>

2
src/core/main.cpp
Unescape View File

@ -14,7 +14,7 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kapplication.h> #include <kapplication.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
static const char description[] = static const char description[] =

2
src/document.cpp
Unescape View File

@ -15,7 +15,7 @@
#include "view.h" #include "view.h"
#include "viewcontainer.h" #include "viewcontainer.h"
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <ktabwidget.h> #include <ktabwidget.h>

2
src/electronics/subcircuits.cpp
Unescape View File

@ -16,7 +16,7 @@
#include "subcircuits.h" #include "subcircuits.h"
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

2
src/filemetainfo.cpp
Unescape View File

@ -12,7 +12,7 @@
#include "textdocument.h" #include "textdocument.h"
#include "textview.h" #include "textview.h"
#include <kconfig.h> #include <tdeconfig.h>
//BEGIN class MetaInfo //BEGIN class MetaInfo

2
src/gui/itemselector.cpp
Unescape View File

@ -19,7 +19,7 @@
#include "mechanicsdocument.h" #include "mechanicsdocument.h"
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>

2
src/gui/oscilloscope.cpp
Unescape View File

@ -18,7 +18,7 @@
#include <cmath> #include <cmath>
#include <kcombobox.h> #include <kcombobox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <kiconloader.h> #include <kiconloader.h>

2
src/gui/oscilloscopeview.cpp
Unescape View File

@ -14,7 +14,7 @@
#include "probepositioner.h" #include "probepositioner.h"
#include "simulator.h" #include "simulator.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>

2
src/gui/outputmethoddlg.cpp
Unescape View File

@ -18,7 +18,7 @@
#include "projectmanager.h" #include "projectmanager.h"
#include <kcombobox.h> #include <kcombobox.h>
#include <kconfigskeleton.h> #include <tdeconfigskeleton.h>
#include <kdebug.h> #include <kdebug.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kurlrequester.h> #include <kurlrequester.h>

2
src/gui/projectdlgs.cpp
Unescape View File

@ -20,7 +20,7 @@
#include <assert.h> #include <assert.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <tdeversion.h> #include <tdeversion.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <klineedit.h> #include <klineedit.h>
#include <klocale.h> #include <klocale.h>
#include <kurlrequester.h> #include <kurlrequester.h>

2
src/gui/settingsdlg.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <klineedit.h> #include <klineedit.h>
#include <klocale.h> #include <klocale.h>

2
src/gui/settingsdlg.h
Unescape View File

@ -11,7 +11,7 @@
#ifndef SETTINGSDLG_H #ifndef SETTINGSDLG_H
#define SETTINGSDLG_H #define SETTINGSDLG_H
#include <kconfigdialog.h> #include <tdeconfigdialog.h>
#include <tqmap.h> #include <tqmap.h>
class AsmFormattingWidget; class AsmFormattingWidget;

2
src/gui/symbolviewer.cpp
Unescape View File

@ -15,7 +15,7 @@
#include "symbolviewer.h" #include "symbolviewer.h"
#include <kcombobox.h> #include <kcombobox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <tqlabel.h> #include <tqlabel.h>

2
src/icnview.cpp
Unescape View File

@ -13,7 +13,7 @@
#include "icnview.h" #include "icnview.h"
#include "ktechlab.h" #include "ktechlab.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>

4
src/itemdocument.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
@ -787,7 +787,7 @@ void ItemDocument::exportToImage()
// the Export shortcut is pressed or the Export toolbar // the Export shortcut is pressed or the Export toolbar
// button is clicked // button is clicked
// widget for the kfiledialog // widget for the tdefiledialog
// It is the bit that says "Crop circuit?" // It is the bit that says "Crop circuit?"
// Okay need to think of something way better to say here. // Okay need to think of something way better to say here.
// gotme here, KFileDialog makes itself parent so tries to destroy cropCheck when it is deleted. // gotme here, KFileDialog makes itself parent so tries to destroy cropCheck when it is deleted.

2
src/itemdocumentdata.cpp
Unescape View File

@ -20,7 +20,7 @@
#include "pinmapping.h" #include "pinmapping.h"
#include <kdebug.h> #include <kdebug.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <ktempfile.h> #include <ktempfile.h>

2
src/katemdi.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>

4
src/ktechlab.cpp
Unescape View File

@ -43,9 +43,9 @@
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <kedittoolbar.h> #include <kedittoolbar.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kkeydialog.h> #include <kkeydialog.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>

2
src/languages/language.cpp
Unescape View File

@ -19,7 +19,7 @@
#include "src/core/ktlconfig.h" #include "src/core/ktlconfig.h"
#include <kdebug.h> #include <kdebug.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kprocess.h> #include <kprocess.h>
#include <tqregexp.h> #include <tqregexp.h>

2
src/languages/picprogrammer.cpp
Unescape View File

@ -13,7 +13,7 @@
#include "src/core/ktlconfig.h" #include "src/core/ktlconfig.h"
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>

4
src/projectmanager.cpp
Unescape View File

@ -21,9 +21,9 @@
#include "recentfilesaction.h" #include "recentfilesaction.h"
#include <kdebug.h> #include <kdebug.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kmimetype.h> #include <kmimetype.h>

2
src/recentfilesaction.cpp
Unescape View File

@ -10,7 +10,7 @@
#include "recentfilesaction.h" #include "recentfilesaction.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kurl.h> #include <kurl.h>

2
src/viewcontainer.cpp
Unescape View File

@ -14,7 +14,7 @@
#include "view.h" #include "view.h"
#include "viewcontainer.h" #include "viewcontainer.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <klocale.h> #include <klocale.h>

Write Preview
Loading…
Cancel
Save