summaryrefslogtreecommitdiffstats
path: root/karm
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-26 13:17:50 -0600
committerTimothy Pearson <[email protected]>2013-01-26 13:17:50 -0600
commitb363d2579af0a11b77e698aed2e1021c2233b644 (patch)
treef4a47b87354b7a6a3b266c8121bd8ddaeb7accaa /karm
parent61bddfe3a7226b18c68a76124b727c736f431688 (diff)
downloadtdepim-b363d2579af0a11b77e698aed2e1021c2233b644.tar.gz
tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'karm')
-rw-r--r--karm/CMakeLists.txt4
-rw-r--r--karm/Makefile.am8
-rw-r--r--karm/karm_part.cpp2
-rw-r--r--karm/karm_part.h4
-rw-r--r--karm/mainwindow.cpp2
-rw-r--r--karm/mainwindow.h2
-rw-r--r--karm/test/Makefile.am4
-rw-r--r--karm/test/locking.cpp2
-rwxr-xr-xkarm/test/remote_storage.sh2
9 files changed, 15 insertions, 15 deletions
diff --git a/karm/CMakeLists.txt b/karm/CMakeLists.txt
index 8b1b64323..996a58838 100644
--- a/karm/CMakeLists.txt
+++ b/karm/CMakeLists.txt
@@ -13,7 +13,7 @@ tde_import( libkmime )
tde_import( ktnef )
tde_import( libkcal )
tde_import( libtdepim )
-tde_import( kresources )
+tde_import( tderesources )
add_subdirectory( support )
add_subdirectory( pics )
@@ -25,7 +25,7 @@ include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/libkcal
${CMAKE_SOURCE_DIR}/libtdepim
- ${CMAKE_SOURCE_DIR}/kresources/remote
+ ${CMAKE_SOURCE_DIR}/tderesources/remote
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
diff --git a/karm/Makefile.am b/karm/Makefile.am
index 9f8d1d87f..cb7760f07 100644
--- a/karm/Makefile.am
+++ b/karm/Makefile.am
@@ -1,13 +1,13 @@
############ Autoconf-generated variables ###################
-INCLUDES = -I$(top_srcdir)/libkcal -I$(top_srcdir)/kresources/remote -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir)/libkcal -I$(top_srcdir)/tderesources/remote -I$(top_srcdir) $(all_includes)
bin_PROGRAMS = karm
SUBDIRS = support pics test
METASOURCES = AUTO
-COMPILE_BEFORE_karm = libtdepim kresources
+COMPILE_BEFORE_karm = libtdepim tderesources
noinst_LTLIBRARIES = libkarm_shared.la
@@ -19,11 +19,11 @@ libkarm_shared_la_SOURCES = kaccelmenuwatch.cpp desktoptracker.cpp \
csvexportdialog_base.ui csvexportdialog.cpp plannerparser.cpp \
karmdcopiface.skel taskviewwhatsthis.cpp
libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
- $(top_builddir)/kresources/remote/libkcal_resourceremote.la \
+ $(top_builddir)/tderesources/remote/libkcal_resourceremote.la \
$(top_builddir)/libtdepim/libtdepim.la $(LIBXSS) -ltdeprint
karm_SOURCES = main.cpp
karm_LDADD = libkarm_shared.la
-karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \
idletimedetector.h kaccelmenuwatch.h timekard.h \
karmutility.h ktimewidget.h karmstorage.h mainwindow.h \
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index b278d9f25..b8426f22b 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -156,7 +156,7 @@ void karmPart::makeMenus()
TQT_SLOT( newTask() ), actionCollection(),
"new_task");
actionNewSub = new KAction( i18n("New &Subtask..."),
- TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N,
+ TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N,
TQT_TQOBJECT(_taskView),
TQT_SLOT( newSubTask() ), actionCollection(),
"new_sub_task");
diff --git a/karm/karm_part.h b/karm/karm_part.h
index f04d48ff5..444b6f428 100644
--- a/karm/karm_part.h
+++ b/karm/karm_part.h
@@ -1,9 +1,9 @@
#ifndef _KARMPART_H_
#define _KARMPART_H_
-#include <kparts/part.h>
+#include <tdeparts/part.h>
#include "karmerrors.h"
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
#include <karmdcopiface.h>
#include "reportcriteria.h"
#include <tqlistview.h>
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index c7e717e45..7e692092d 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -294,7 +294,7 @@ void MainWindow::makeMenus()
TQT_SLOT( newTask() ), actionCollection(),
"new_task");
actionNewSub = new KAction( i18n("New &Subtask..."),
- TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N,
+ TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N,
TQT_TQOBJECT(_taskView),
TQT_SLOT( newSubTask() ), actionCollection(),
"new_sub_task");
diff --git a/karm/mainwindow.h b/karm/mainwindow.h
index 366af3d7e..ba1194f4a 100644
--- a/karm/mainwindow.h
+++ b/karm/mainwindow.h
@@ -1,7 +1,7 @@
#ifndef KARM_MAIN_WINDOW_H
#define KARM_MAIN_WINDOW_H
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
#include "karmerrors.h"
#include <karmdcopiface.h>
diff --git a/karm/test/Makefile.am b/karm/test/Makefile.am
index 3940fb373..506991391 100644
--- a/karm/test/Makefile.am
+++ b/karm/test/Makefile.am
@@ -3,11 +3,11 @@ METASOURCES = AUTO
check_PROGRAMS = runscripts locking
runscripts_SOURCES = script.cpp runscripts.cpp
-runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
runscripts_LDADD = $(LIB_QT) $(LIB_TDECORE)
locking_SOURCES = locking.cpp lockerthread.cpp
-locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp
index ac1de23e3..448e7c1dc 100644
--- a/karm/test/locking.cpp
+++ b/karm/test/locking.cpp
@@ -128,7 +128,7 @@ int main( int argc, char *argv[] )
short rval = 0;
// Use another directory than the real one, just to keep things clean
- // TDEHOME needs to be writable though, for a ksycoca database
+ // TDEHOME needs to be writable though, for a tdesycoca database
// FIXME: Delete this directory when done with test.
setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testresource" ), true );
diff --git a/karm/test/remote_storage.sh b/karm/test/remote_storage.sh
index a4335b6c1..84af71c59 100755
--- a/karm/test/remote_storage.sh
+++ b/karm/test/remote_storage.sh
@@ -15,7 +15,7 @@ DCOPID=`dcop | grep karm 2>/dev/null`
if [ -n $DCOPID ]; then dcop $DCOPID KarmDCOPIface quit; fi;
if [ -e $TESTFILE_LOCAL ]; then rm $TESTFILE_LOCAL; fi
-# if the file does not exist, kresources pops up a modal dialog box
+# if the file does not exist, tderesources pops up a modal dialog box
# telling us that a file does not exist.
touch $TESTFILE_LOCAL