summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:55:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:55:13 -0600
commit5b4a8f1b52c0ca8f0e9ed30b3bef5c0900d2fe73 (patch)
tree1c57ccbe3df809325633a623b6e5d346d0f9c512
parent0d14eb954a464f8fdfc7b54c19faa72120e3e92a (diff)
downloadkpicosim-5b4a8f1b52c0ca8f0e9ed30b3bef5c0900d2fe73.tar.gz
kpicosim-5b4a8f1b52c0ca8f0e9ed30b3bef5c0900d2fe73.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
-rw-r--r--acinclude.m48
-rwxr-xr-xsrc/codeeditor.cpp2
-rwxr-xr-xsrc/kexportdialog.cpp2
-rw-r--r--src/kjtagdialog.cpp2
-rwxr-xr-xsrc/kpicosim.cpp2
-rwxr-xr-xsrc/kpicosimconfig.h2
6 files changed, 9 insertions, 9 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index e7f5f53..0aad871 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -590,7 +590,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
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)])
fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
@@ -1741,7 +1741,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la"
else
kde_check_header="ksharedptr.h"
- kde_check_lib="libkio.la"
+ kde_check_lib="libtdeio.la"
fi
if test -z "$1"; then
@@ -2037,7 +2037,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
- AC_SUBST(LIB_KFILE, "-lkfile")
+ AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2047,7 +2047,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(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)")
fi
])
diff --git a/src/codeeditor.cpp b/src/codeeditor.cpp
index 1eb5201..c21be56 100755
--- a/src/codeeditor.cpp
+++ b/src/codeeditor.cpp
@@ -23,7 +23,7 @@
#include <tqmessagebox.h>
#include <kmessagebox.h>
#include <tqlayout.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
CodeEditor::CodeEditor(TQWidget *parent, const char *name)
: TQWidget(parent, name)
diff --git a/src/kexportdialog.cpp b/src/kexportdialog.cpp
index b6452e7..a53922d 100755
--- a/src/kexportdialog.cpp
+++ b/src/kexportdialog.cpp
@@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "kexportdialog.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
KExportDialog::KExportDialog( TQWidget *parent, const char *name ) : TQDialog(parent, name)
{
diff --git a/src/kjtagdialog.cpp b/src/kjtagdialog.cpp
index 2ab8008..26c7d26 100644
--- a/src/kjtagdialog.cpp
+++ b/src/kjtagdialog.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "kjtagdialog.h"
#include <tqmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kiconloader.h>
KJTAGDialog::KJTAGDialog( TQWidget *parent )
diff --git a/src/kpicosim.cpp b/src/kpicosim.cpp
index 569f8e8..c47fd2f 100755
--- a/src/kpicosim.cpp
+++ b/src/kpicosim.cpp
@@ -77,7 +77,7 @@
#include <kiconloader.h>
#include "kexportdialog.h"
#include "kjtagdialog.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kmessagebox.h>
#include <tqlayout.h>
#include <ksimpleconfig.h>
diff --git a/src/kpicosimconfig.h b/src/kpicosimconfig.h
index 681e392..e5f13e6 100755
--- a/src/kpicosimconfig.h
+++ b/src/kpicosimconfig.h
@@ -20,7 +20,7 @@
#ifndef KPICOSIMCONFIG_H
#define KPICOSIMCONFIG_H
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
/**
@author Mark Six