summaryrefslogtreecommitdiffstats
path: root/kalarm
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 02:31:44 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 02:31:44 -0600
commitd70ce47c224b328c429a5f2406e5e793b009541d (patch)
treecef1f2b51b5429229c2c5fad2436b60dddbcf6cc /kalarm
parent480ccc4ed6441c8e663dc62be689c19499d806ea (diff)
downloadtdepim-d70ce47c224b328c429a5f2406e5e793b009541d.tar.gz
tdepim-d70ce47c224b328c429a5f2406e5e793b009541d.zip
Additional kde to tde renaming
Diffstat (limited to 'kalarm')
-rw-r--r--kalarm/daemon.cpp2
-rw-r--r--kalarm/kalarmd/Makefile.am4
-rw-r--r--kalarm/kalarmd/alarmdaemon.cpp2
-rw-r--r--kalarm/lib/Makefile.am2
-rw-r--r--kalarm/lib/colourcombo.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index 012725022..1f8820bff 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -141,7 +141,7 @@ bool Daemon::start()
kdError() << "Daemon::startApp(): " DAEMON_APP_NAME " not found" << endl;
return false;
}
- KApplication::kdeinitExec(execStr);
+ KApplication::tdeinitExec(execStr);
kdDebug(5950) << "Daemon::start(): Alarm daemon started" << endl;
mStartTimeout = 5000/startCheckInterval + 1; // check daemon status for 5 seconds before giving up
mStartTimer = new TQTimer(mInstance);
diff --git a/kalarm/kalarmd/Makefile.am b/kalarm/kalarmd/Makefile.am
index 9dc911376..6435d3c9f 100644
--- a/kalarm/kalarmd/Makefile.am
+++ b/kalarm/kalarmd/Makefile.am
@@ -2,13 +2,13 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kalarm $(all_includes)
noinst_LTLIBRARIES = libkalarmd.la
-libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libkalarmd_la_LIBADD = $(LIB_KDECORE) $(top_builddir)/libkcal/libkcal.la
libkalarmd_la_SOURCES = alarmdaemoniface.stub alarmguiiface.stub
bin_PROGRAMS = kalarmd
-kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kalarmd_LDADD = $(LIB_KDEUI) $(top_builddir)/libkcal/libkcal.la libkalarmd.la
kalarmd_SOURCES = alarmdaemon.cpp admain.cpp adapp.cpp \
adcalendar.cpp adconfigdata.cpp clientinfo.cpp \
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 099dcd87a..0fad7935f 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -120,7 +120,7 @@ void AlarmDaemon::autostartKAlarm()
kdDebug(5900) << "AlarmDaemon::autostartKAlarm(): starting KAlarm\n";
TQStringList args;
args << TQString::tqfromLatin1("--tray");
- int ret = KApplication::kdeinitExec(TQString::tqfromLatin1("kalarm"), args);
+ int ret = KApplication::tdeinitExec(TQString::tqfromLatin1("kalarm"), args);
if (ret)
kdError(5900) << "AlarmDaemon::autostartKAlarm(): error=" << ret << endl;
else
diff --git a/kalarm/lib/Makefile.am b/kalarm/lib/Makefile.am
index 7d236b5a2..675021d50 100644
--- a/kalarm/lib/Makefile.am
+++ b/kalarm/lib/Makefile.am
@@ -18,5 +18,5 @@ noinst_HEADERS = \
timeperiod.h shellprocess.h slider.h spinbox.h spinbox2.h \
synchtimer.h spinbox2private.h
-DOXYGEN_REFERENCES=kdecore kdeui libtdepim
+DOXYGEN_REFERENCES=tdecore tdeui libtdepim
include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp
index 4d10f6e63..621f3e837 100644
--- a/kalarm/lib/colourcombo.cpp
+++ b/kalarm/lib/colourcombo.cpp
@@ -3,7 +3,7 @@
* Program: kalarm
* Copyright (c) 2001 - 2003, 2005 by David Jarvie <software@astrojar.org.uk>
*
- * Some code taken from kdelibs/kdeui/kcolorcombo.cpp in the KDE libraries:
+ * Some code taken from kdelibs/tdeui/kcolorcombo.cpp in the KDE libraries:
* Copyright (C) 1997 Martin Jones (mjones@kde.org)
*
* This program is free software; you can redistribute it and/or modify