summaryrefslogtreecommitdiffstats
path: root/karm
diff options
context:
space:
mode:
Diffstat (limited to 'karm')
-rw-r--r--karm/CMakeLists.txt2
-rw-r--r--karm/Makefile.am4
-rw-r--r--karm/karm_part.cpp6
-rw-r--r--karm/mainwindow.cpp6
-rw-r--r--karm/taskview.h2
-rw-r--r--karm/taskviewwhatsthis.cpp2
-rw-r--r--karm/taskviewwhatsthis.h2
-rw-r--r--karm/tdeaccelmenuwatch.cpp6
-rw-r--r--karm/tdeaccelmenuwatch.h10
-rw-r--r--karm/tray.cpp4
-rw-r--r--karm/tray.h2
11 files changed, 23 insertions, 23 deletions
diff --git a/karm/CMakeLists.txt b/karm/CMakeLists.txt
index 996a58838..8c785b2f6 100644
--- a/karm/CMakeLists.txt
+++ b/karm/CMakeLists.txt
@@ -48,7 +48,7 @@ install( FILES karmui.rc DESTINATION ${DATA_INSTALL_DIR}/karmpart )
tde_add_library( karm SHARED AUTOMOC
SOURCES
- kaccelmenuwatch.cpp desktoptracker.cpp edittaskdialog.cpp
+ tdeaccelmenuwatch.cpp desktoptracker.cpp edittaskdialog.cpp
idletimedetector.cpp printdialog.cpp timekard.cpp karmutility.cpp
ktimewidget.cpp karmstorage.cpp mainwindow.cpp preferences.cpp
print.cpp task.cpp taskview.cpp tray.cpp csvexportdialog_base.ui
diff --git a/karm/Makefile.am b/karm/Makefile.am
index cb7760f07..76ae9acf2 100644
--- a/karm/Makefile.am
+++ b/karm/Makefile.am
@@ -11,7 +11,7 @@ COMPILE_BEFORE_karm = libtdepim tderesources
noinst_LTLIBRARIES = libkarm_shared.la
-libkarm_shared_la_SOURCES = kaccelmenuwatch.cpp desktoptracker.cpp \
+libkarm_shared_la_SOURCES = tdeaccelmenuwatch.cpp desktoptracker.cpp \
edittaskdialog.cpp idletimedetector.cpp \
printdialog.cpp timekard.cpp karmutility.cpp ktimewidget.cpp \
karmstorage.cpp mainwindow.cpp preferences.cpp print.cpp \
@@ -25,7 +25,7 @@ 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) -ltdetexteditor
noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \
- idletimedetector.h kaccelmenuwatch.h timekard.h \
+ idletimedetector.h tdeaccelmenuwatch.h timekard.h \
karmutility.h ktimewidget.h karmstorage.h mainwindow.h \
preferences.h print.h task.h taskview.h toolicons.h \
tray.h version.h csvexportdialog.h plannerparser.h taskviewwhatsthis.h
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index f56e02c17..d0c86e21b 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -1,15 +1,15 @@
-#include "kaccelmenuwatch.h"
+#include "tdeaccelmenuwatch.h"
#include "karm_part.h"
#include "karmerrors.h"
#include "task.h"
#include "preferences.h"
#include "tray.h"
#include "version.h"
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdaction.h>
#include <tdefiledialog.h>
#include <kglobal.h>
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 6bfbcc32c..1eebca1e7 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -5,10 +5,10 @@
#include <numeric>
-#include "kaccelmenuwatch.h"
+#include "tdeaccelmenuwatch.h"
#include <dcopclient.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
#include <kapplication.h> // kapp
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/karm/taskview.h b/karm/taskview.h
index db00f5b16..cbb5def75 100644
--- a/karm/taskview.h
+++ b/karm/taskview.h
@@ -5,7 +5,7 @@
#include <tqptrlist.h>
#include <tqptrstack.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include "desktoplist.h"
#include "resourcecalendar.h"
diff --git a/karm/taskviewwhatsthis.cpp b/karm/taskviewwhatsthis.cpp
index 4cc9f7513..1598a8519 100644
--- a/karm/taskviewwhatsthis.cpp
+++ b/karm/taskviewwhatsthis.cpp
@@ -11,7 +11,7 @@
//
#include "taskviewwhatsthis.h"
#include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
TaskViewWhatsThis::TaskViewWhatsThis( TQWidget* qw )
diff --git a/karm/taskviewwhatsthis.h b/karm/taskviewwhatsthis.h
index 1bea3497c..cd2f0dffc 100644
--- a/karm/taskviewwhatsthis.h
+++ b/karm/taskviewwhatsthis.h
@@ -11,7 +11,7 @@
#define TASKVIEWWHATSTHIS_H
#include <tqwhatsthis.h>
-#include <klistview.h>
+#include <tdelistview.h>
/**
this is the karm-taskview-specific implementation of qwhatsthis
diff --git a/karm/tdeaccelmenuwatch.cpp b/karm/tdeaccelmenuwatch.cpp
index 4b5952848..5cb223664 100644
--- a/karm/tdeaccelmenuwatch.cpp
+++ b/karm/tdeaccelmenuwatch.cpp
@@ -1,5 +1,5 @@
/*
-* kaccelmenuwatch.cpp -- Implementation of class TDEAccelMenuWatch.
+* tdeaccelmenuwatch.cpp -- Implementation of class TDEAccelMenuWatch.
* Author: Sirtaj Singh Kang
* Generated: Thu Jan 7 15:05:26 EST 1999
*/
@@ -7,7 +7,7 @@
#include <assert.h>
#include <tqpopupmenu.h>
-#include "kaccelmenuwatch.h"
+#include "tdeaccelmenuwatch.h"
TDEAccelMenuWatch::TDEAccelMenuWatch( TDEAccel *accel, TQObject *parent )
: TQObject( parent ),
@@ -110,4 +110,4 @@ TDEAccelMenuWatch::AccelItem *TDEAccelMenuWatch::newAccelItem( TQPopupMenu *,
return item;
}
-#include "kaccelmenuwatch.moc"
+#include "tdeaccelmenuwatch.moc"
diff --git a/karm/tdeaccelmenuwatch.h b/karm/tdeaccelmenuwatch.h
index 388cd06f5..6e432f340 100644
--- a/karm/tdeaccelmenuwatch.h
+++ b/karm/tdeaccelmenuwatch.h
@@ -1,5 +1,5 @@
/*
-* kaccelmenuwatch.h -- Declaration of class TDEAccelMenuWatch.
+* tdeaccelmenuwatch.h -- Declaration of class TDEAccelMenuWatch.
* Generated by newclass on Thu Jan 7 15:05:26 EST 1999.
*/
#ifndef KARM_K_ACCEL_MENU_WATCH_H
@@ -8,7 +8,7 @@
#include <tqobject.h>
#include <tqptrlist.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
class TQPopupMenu;
@@ -19,8 +19,8 @@ class TQPopupMenu;
* is connected, we normally have to manually call
* TDEAccel::changeMenuAccel() again for each update of the TDEAccel object.
*
- * With TDEAccelMenuWatch you provide the kaccel object and the menu
- * items to which it connects, and if you update the kaccel you just have
+ * With TDEAccelMenuWatch you provide the tdeaccel object and the menu
+ * items to which it connects, and if you update the tdeaccel you just have
* to call TDEAccelMenuWatch::updateMenus() and the menu items will be updated.
*
* It is safe to delete menus that have connections handled by this class.
@@ -99,7 +99,7 @@ class TDEAccelMenuWatch : public TQObject
public slots:
/**
* Updates all menu accelerators. Call this after all accelerators
- * have been connected or the kaccel object has been updated.
+ * have been connected or the tdeaccel object has been updated.
*/
void updateMenus();
diff --git a/karm/tray.cpp b/karm/tray.cpp
index 2933b8ae8..06d08af26 100644
--- a/karm/tray.cpp
+++ b/karm/tray.cpp
@@ -16,12 +16,12 @@
#include <tqtimer.h>
#include <tqtooltip.h>
-#include <kaction.h> // actionPreferences()
+#include <tdeaction.h> // actionPreferences()
#include <kglobal.h>
#include <kglobalsettings.h>
#include <kiconloader.h> // UserIcon
#include <klocale.h> // i18n
-#include <kpopupmenu.h> // plug()
+#include <tdepopupmenu.h> // plug()
#include <ksystemtray.h>
#include "mainwindow.h"
diff --git a/karm/tray.h b/karm/tray.h
index 134e34fa6..45b3b7024 100644
--- a/karm/tray.h
+++ b/karm/tray.h
@@ -5,7 +5,7 @@
#include <tqpixmap.h>
#include <tqptrlist.h>
// experiement
-// #include <kpopupmenu.h>
+// #include <tdepopupmenu.h>
#include <ksystemtray.h>
#include "task.h"