summaryrefslogtreecommitdiffstats
path: root/kalarm
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:55 -0600
commitd318087925a540a204c9d3820d5a09fbda58b8b2 (patch)
treeb8dde6aa5d6559b81c6667d8364a4364c27bcba4 /kalarm
parent6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff)
downloadtdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz
tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kalarm')
-rw-r--r--kalarm/birthdaydlg.cpp2
-rw-r--r--kalarm/birthdaydlg.h2
-rw-r--r--kalarm/daemon.h2
-rw-r--r--kalarm/eventlistviewbase.h2
-rw-r--r--kalarm/fontcolour.h2
-rw-r--r--kalarm/functions.cpp4
-rw-r--r--kalarm/mainwindow.cpp10
-rw-r--r--kalarm/mainwindowbase.h2
-rw-r--r--kalarm/messagewin.cpp2
-rw-r--r--kalarm/templatedlg.cpp2
-rw-r--r--kalarm/templatelistview.h2
-rw-r--r--kalarm/templatemenuaction.cpp4
-rw-r--r--kalarm/templatemenuaction.h2
-rw-r--r--kalarm/traywindow.cpp4
14 files changed, 21 insertions, 21 deletions
diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp
index 6928cc601..165e5aba7 100644
--- a/kalarm/birthdaydlg.cpp
+++ b/kalarm/birthdaydlg.cpp
@@ -31,7 +31,7 @@
#include <kglobal.h>
#include <tdeconfig.h>
#include <kmessagebox.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <kabc/addressbook.h>
#include <kabc/stdaddressbook.h>
#include <kdebug.h>
diff --git a/kalarm/birthdaydlg.h b/kalarm/birthdaydlg.h
index e680880e8..ccddbd656 100644
--- a/kalarm/birthdaydlg.h
+++ b/kalarm/birthdaydlg.h
@@ -21,7 +21,7 @@
#define BIRTHDAYDLG_H
#include <tqlineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kdialogbase.h>
#include "alarmevent.h"
diff --git a/kalarm/daemon.h b/kalarm/daemon.h
index 80afd2739..4feba1bbf 100644
--- a/kalarm/daemon.h
+++ b/kalarm/daemon.h
@@ -23,7 +23,7 @@
#include <tqobject.h>
#include <tqdatetime.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kalarmd/kalarmd.h>
#include <kalarmd/alarmguiiface.h>
diff --git a/kalarm/eventlistviewbase.h b/kalarm/eventlistviewbase.h
index d733e19b2..9f043f770 100644
--- a/kalarm/eventlistviewbase.h
+++ b/kalarm/eventlistviewbase.h
@@ -24,7 +24,7 @@
#include "kalarm.h"
#include <tqvaluelist.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include "alarmevent.h"
diff --git a/kalarm/fontcolour.h b/kalarm/fontcolour.h
index 188324d6b..e550831e0 100644
--- a/kalarm/fontcolour.h
+++ b/kalarm/fontcolour.h
@@ -24,7 +24,7 @@
#include <tdeversion.h>
#include <tqwidget.h>
#include <tqstringlist.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include "colourlist.h"
class ColourCombo;
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index 1177d23c5..9808f06ea 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -39,11 +39,11 @@
#include <tqregexp.h>
#include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kglobal.h>
#include <klocale.h>
#include <kstdguiitem.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <kmessagebox.h>
#include <tdefiledialog.h>
#include <dcopclient.h>
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index 95a988ad9..2db16ff1e 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -25,11 +25,11 @@
#include <tqheader.h>
#include <kmenubar.h>
-#include <ktoolbar.h>
-#include <kpopupmenu.h>
-#include <kaccel.h>
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdetoolbar.h>
+#include <tdepopupmenu.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
#include <kstdaction.h>
#include <kiconloader.h>
#include <kmessagebox.h>
diff --git a/kalarm/mainwindowbase.h b/kalarm/mainwindowbase.h
index 17f55ff8d..8ecdffe24 100644
--- a/kalarm/mainwindowbase.h
+++ b/kalarm/mainwindowbase.h
@@ -21,7 +21,7 @@
#ifndef MAINWINDOWBASE_H
#define MAINWINDOWBASE_H
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
/**
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 7c17edd02..bbc6303ba 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -35,7 +35,7 @@
#include <tqtimer.h>
#include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdguiitem.h>
#include <kaboutdata.h>
#include <klocale.h>
diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp
index fab155e34..c555ce6a0 100644
--- a/kalarm/templatedlg.cpp
+++ b/kalarm/templatedlg.cpp
@@ -27,7 +27,7 @@
#include <klocale.h>
#include <kguiitem.h>
#include <kmessagebox.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <kdebug.h>
#include "editdlg.h"
diff --git a/kalarm/templatelistview.h b/kalarm/templatelistview.h
index 2127bce3b..530a073a0 100644
--- a/kalarm/templatelistview.h
+++ b/kalarm/templatelistview.h
@@ -24,7 +24,7 @@
#include "kalarm.h"
#include <tqmap.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include "eventlistviewbase.h"
diff --git a/kalarm/templatemenuaction.cpp b/kalarm/templatemenuaction.cpp
index 7500b4764..5da72a6d5 100644
--- a/kalarm/templatemenuaction.cpp
+++ b/kalarm/templatemenuaction.cpp
@@ -20,8 +20,8 @@
#include "kalarm.h"
-#include <kactionclasses.h>
-#include <kpopupmenu.h>
+#include <tdeactionclasses.h>
+#include <tdepopupmenu.h>
#include <kdebug.h>
#include "alarmcalendar.h"
diff --git a/kalarm/templatemenuaction.h b/kalarm/templatemenuaction.h
index a5d7f1728..abcbf92cd 100644
--- a/kalarm/templatemenuaction.h
+++ b/kalarm/templatemenuaction.h
@@ -21,7 +21,7 @@
#ifndef TEMPLATEMENUACTION_H
#define TEMPLATEMENUACTION_H
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
class KAEvent;
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 3916ebdd2..5fc29fd72 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -27,12 +27,12 @@
#include <kapplication.h>
#include <klocale.h>
#include <kaboutdata.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kstdaction.h>
#include <kstdguiitem.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <tdeconfig.h>
#include <kdebug.h>