From f052e0f1fafde885e6bf192117369d70fa711035 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:09:20 -0600
Subject: [PATCH] Rename many classes and header files to avoid conflicts with
 KDE4

---
 po/nl.po                | 4 ++--
 po/zh_TW.po             | 4 ++--
 src/archive.cpp         | 2 +-
 src/basket.cpp          | 6 +++---
 src/basket.h            | 4 ++--
 src/basket.lsm          | 2 +-
 src/basket_part.cpp     | 2 +-
 src/basketlistview.h    | 2 +-
 src/bnpview.cpp         | 4 ++--
 src/bnpview.h           | 2 +-
 src/filter.cpp          | 2 +-
 src/focusedwidgets.h    | 2 +-
 src/global.cpp          | 4 ++--
 src/kcolorcombo2.cpp    | 2 +-
 src/keyboard.cpp        | 2 +-
 src/kgpgme.cpp          | 2 +-
 src/kicondialogui.ui    | 2 +-
 src/likeback.cpp        | 2 +-
 src/mainwindow.cpp      | 6 +++---
 src/mainwindow.h        | 4 ++--
 src/newbasketdialog.cpp | 2 +-
 src/noteedit.cpp        | 6 +++---
 src/notefactory.cpp     | 2 +-
 src/settings.h          | 4 ++--
 src/systemtray.cpp      | 2 +-
 src/tag.h               | 4 ++--
 src/tagsedit.cpp        | 2 +-
 27 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index d4180a4..179deba 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3517,7 +3517,7 @@ msgstr ""
 #~ msgstr "Basket %1"
 
 #, fuzzy
-#~ msgid "Checklist"
+#~ msgid "Chectdelist"
 #~ msgstr "Aan&gevinkt item :"
 
 #, fuzzy
@@ -3737,7 +3737,7 @@ msgstr ""
 #~ msgstr "Aan&gevinkt item :"
 
 #, fuzzy
-#~ msgid "Checklist basket."
+#~ msgid "Chectdelist basket."
 #~ msgstr "Nieuwe basket..."
 
 #, fuzzy
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ab90170..9c8b3e6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3479,7 +3479,7 @@ msgstr ""
 #~ msgstr "Basket %1"
 
 #, fuzzy
-#~ msgid "Checklist"
+#~ msgid "Chectdelist"
 #~ msgstr "檢查物件(&k)"
 
 #, fuzzy
@@ -3687,7 +3687,7 @@ msgstr ""
 #~ msgstr "檢查物件(&k)"
 
 #, fuzzy
-#~ msgid "Checklist basket."
+#~ msgid "Chectdelist basket."
 #~ msgstr "新建basket..."
 
 #, fuzzy
diff --git a/src/archive.cpp b/src/archive.cpp
index d6d8df1..2d545e3 100644
--- a/src/archive.cpp
+++ b/src/archive.cpp
@@ -32,7 +32,7 @@
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <kprogress.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "archive.h"
 #include "global.h"
diff --git a/src/basket.cpp b/src/basket.cpp
index f18c8cc..1064349 100644
--- a/src/basket.cpp
+++ b/src/basket.cpp
@@ -49,7 +49,7 @@
 
 #include <unistd.h> // For sleep()
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <krun.h>
 
@@ -5485,13 +5485,13 @@ void Basket::lock()
 #include <tqstring.h>
 #include <tqpixmap.h>
 #include <tqcolor.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurllabel.h>
 #include <tqcheckbox.h>
 #include <tqpalette.h>
 #include <tqcursor.h>
 #include <tqaction.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kglobalsettings.h>
 #include <tqevent.h>
 
diff --git a/src/basket.h b/src/basket.h
index db516d0..1d1b15a 100644
--- a/src/basket.h
+++ b/src/basket.h
@@ -28,9 +28,9 @@
 #include <tqimage.h>
 #include <tqdatetime.h>
 #include <tqclipboard.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kdirwatch.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeio/job.h>
 #include <kdialogbase.h>
 
diff --git a/src/basket.lsm b/src/basket.lsm
index 61060b3..b516fc1 100644
--- a/src/basket.lsm
+++ b/src/basket.lsm
@@ -3,7 +3,7 @@ Title:          Basket Note Pads
 Version:        R14.0.0
 Entered-date:   2010-05-10
 Description:    A multi-purpose note-taking program
-Keywords:       TDE Qt Basket Note Pad Item Drop Paste Checklist Stack
+Keywords:       TDE Qt Basket Note Pad Item Drop Paste Chectdelist Stack
 Author:         Sébastien Laoût <slaout@linux62.org>
 Maintained-by:  The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
 Primary-site:   http://git.trinitydesktop.org/cgit/
diff --git a/src/basket_part.cpp b/src/basket_part.cpp
index 17b8558..30f3453 100644
--- a/src/basket_part.cpp
+++ b/src/basket_part.cpp
@@ -21,7 +21,7 @@
 #include "basket_part.h"
 
 #include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
 #include <kglobal.h>
diff --git a/src/basketlistview.h b/src/basketlistview.h
index 35d7a5a..7bfbf5f 100644
--- a/src/basketlistview.h
+++ b/src/basketlistview.h
@@ -21,7 +21,7 @@
 #ifndef BASKETLISTVIEW_H
 #define BASKETLISTVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqtimer.h>
 
 class Basket;
diff --git a/src/bnpview.cpp b/src/bnpview.cpp
index 8a4308b..8560e35 100644
--- a/src/bnpview.cpp
+++ b/src/bnpview.cpp
@@ -27,7 +27,7 @@
 #include <tqimage.h>
 #include <tqbitmap.h>
 #include <tqwhatsthis.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqsignalmapper.h>
 #include <tqdir.h>
 #include <kicontheme.h>
@@ -40,7 +40,7 @@
 #include <kstandarddirs.h>
 #include <kaboutdata.h>
 #include <twin.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kpassivepopup.h>
 #include <kxmlguifactory.h>
 #include <kcmdlineargs.h>
diff --git a/src/bnpview.h b/src/bnpview.h
index 0fabb22..780f44d 100644
--- a/src/bnpview.h
+++ b/src/bnpview.h
@@ -21,7 +21,7 @@
 #ifndef BNPVIEW_H
 #define BNPVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kxmlguiclient.h>
 #include <tqtimer.h>
 #include <tqclipboard.h>
diff --git a/src/filter.cpp b/src/filter.cpp
index f7dd503..84c94e2 100644
--- a/src/filter.cpp
+++ b/src/filter.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <tqlayout.h>
-//#include <ktoolbarbutton.h>
+//#include <tdetoolbarbutton.h>
 #include <tqtoolbutton.h>
 #include <tqlabel.h>
 //#include <tqcombobox.h>
diff --git a/src/focusedwidgets.h b/src/focusedwidgets.h
index b710e34..bec5560 100644
--- a/src/focusedwidgets.h
+++ b/src/focusedwidgets.h
@@ -23,7 +23,7 @@
 
 #include <ktextedit.h>
 #include <kcolorcombo.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kapplication.h>
diff --git a/src/global.cpp b/src/global.cpp
index 4ebd8fb..8cb3227 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -21,9 +21,9 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <tqstring.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqdir.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
diff --git a/src/kcolorcombo2.cpp b/src/kcolorcombo2.cpp
index bd4828b..80c9dae 100644
--- a/src/kcolorcombo2.cpp
+++ b/src/kcolorcombo2.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kcolordialog.h>
 #include <tqclipboard.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kcolordrag.h>
 
 #include "kcolorcombo2.h"
diff --git a/src/keyboard.cpp b/src/keyboard.cpp
index 8148dce..b5e51a0 100644
--- a/src/keyboard.cpp
+++ b/src/keyboard.cpp
@@ -22,7 +22,7 @@
 
 #include "keyboard.h"
 
-/* This file contain modified code from klistbox.cpp
+/* This file contain modified code from tdelistbox.cpp
  */
 
 // ShiftMask, ControlMask and Mod1Mask are defined in <X11/X.h>
diff --git a/src/kgpgme.cpp b/src/kgpgme.cpp
index f5a39c6..6603e9f 100644
--- a/src/kgpgme.cpp
+++ b/src/kgpgme.cpp
@@ -26,7 +26,7 @@
 #include <kmessagebox.h>
 #include <kpassdlg.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <tqcheckbox.h>
 #include <tqlayout.h>
diff --git a/src/kicondialogui.ui b/src/kicondialogui.ui
index 9bfa162..a81c2a6 100644
--- a/src/kicondialogui.ui
+++ b/src/kicondialogui.ui
@@ -234,7 +234,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kiconcanvas.h</includehint>
     <includehint>kiconviewsearchline.h</includehint>
     <includehint>kprogress.h</includehint>
diff --git a/src/likeback.cpp b/src/likeback.cpp
index 7ff3a8d..6464617 100644
--- a/src/likeback.cpp
+++ b/src/likeback.cpp
@@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <kaboutdata.h>
 #include <klocale.h>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index df98554..9304c79 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -32,11 +32,11 @@
 #include <tqpoint.h>
 #include <tqpixmap.h>
 #include <tqinputdialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
 #include <tqiconset.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapp.h>
 #include <klocale.h>
 #include <kmenubar.h>
@@ -55,7 +55,7 @@
 #include <kstatusbar.h>
 #include <tqtimer.h>
 #include <tqaction.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kglobalaccel.h>
 #include <kkeydialog.h>
 #include <kpassivepopup.h>
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 77c236c..9d9ea90 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -21,7 +21,7 @@
 #ifndef CONTAINER_H
 #define CONTAINER_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqtabbar.h>
 #include <tqtabwidget.h>
 #include <tqlabel.h>
@@ -29,7 +29,7 @@
 #include <tqptrlist.h>
 #include <tqpoint.h>
 #include <tqclipboard.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqpixmap.h>
 #include <tqdesktopwidget.h>
 #include <tqtimer.h>
diff --git a/src/newbasketdialog.cpp b/src/newbasketdialog.cpp
index 5651815..ceaf987 100644
--- a/src/newbasketdialog.cpp
+++ b/src/newbasketdialog.cpp
@@ -32,7 +32,7 @@
 #include <tqpainter.h>
 #include <kapplication.h>
 #include <kiconloader.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "newbasketdialog.h"
 #include "basketfactory.h"
diff --git a/src/noteedit.cpp b/src/noteedit.cpp
index 01dbf11..a49ada2 100644
--- a/src/noteedit.cpp
+++ b/src/noteedit.cpp
@@ -29,9 +29,9 @@
 #include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kmainwindow.h>
-#include <ktoolbar.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdetoolbar.h>
+#include <tdeaction.h>
 #include <kurifilter.h>
 #include <kdebug.h>
 #include <kstdaction.h>
diff --git a/src/notefactory.cpp b/src/notefactory.cpp
index 81d40f1..ba108eb 100644
--- a/src/notefactory.cpp
+++ b/src/notefactory.cpp
@@ -42,7 +42,7 @@
 #include <kicondialog.h>
 #include <kiconloader.h>
 #include <tqfileinfo.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kurifilter.h>
 
diff --git a/src/settings.h b/src/settings.h
index 8f86989..b9575f1 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -30,8 +30,8 @@
 #include <tqpoint.h>
 #include <tqsize.h>
 #include <tdecmodule.h>
-#include <kaction.h>
-#include <kmainwindow.h>
+#include <tdeaction.h>
+#include <tdemainwindow.h>
 #include <tqdatetime.h>
 
 #include "global.h"
diff --git a/src/systemtray.cpp b/src/systemtray.cpp
index e3aad0c..82da7e2 100644
--- a/src/systemtray.cpp
+++ b/src/systemtray.cpp
@@ -42,7 +42,7 @@
 #include <kmanagerselection.h>
 #include <tdeversion.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include "systemtray.h"
diff --git a/src/tag.h b/src/tag.h
index 50e1fa6..ff8422a 100644
--- a/src/tag.h
+++ b/src/tag.h
@@ -26,8 +26,8 @@
 #include <tqfont.h>
 #include <tqvaluelist.h>
 
-#include <kaction.h>
-#include <kshortcut.h>
+#include <tdeaction.h>
+#include <tdeshortcut.h>
 
 class TQPainter;
 
diff --git a/src/tagsedit.cpp b/src/tagsedit.cpp
index 9ec4972..a39072e 100644
--- a/src/tagsedit.cpp
+++ b/src/tagsedit.cpp
@@ -21,7 +21,7 @@
 #include <tqtooltip.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #include <tqlayout.h>
 #include <kkeybutton.h>
 #include <kicondialog.h>