summaryrefslogtreecommitdiffstats
path: root/kjots
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:31 -0600
commitbd11bce76f195adf4f3806cef8cf2e0737c99ff2 (patch)
treee3c1714d74f67cc51cd04162cd4afa927dd7f7d4 /kjots
parent2d7591be424ae10d974d01e0e2f781d19ef07cd6 (diff)
downloadtdeutils-bd11bce76f195adf4f3806cef8cf2e0737c99ff2.tar.gz
tdeutils-bd11bce76f195adf4f3806cef8cf2e0737c99ff2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kjots')
-rw-r--r--kjots/CHANGES2
-rw-r--r--kjots/KJotsMain.cpp6
-rw-r--r--kjots/KJotsMain.h2
-rw-r--r--kjots/confpagefont.ui2
-rw-r--r--kjots/kjotsedit.cpp2
-rw-r--r--kjots/kjotsentry.h2
6 files changed, 8 insertions, 8 deletions
diff --git a/kjots/CHANGES b/kjots/CHANGES
index 9815d90..e2da856 100644
--- a/kjots/CHANGES
+++ b/kjots/CHANGES
@@ -37,7 +37,7 @@ new in version 0.2.5
- more kde conforming due to the use of KTopLevelWidget
new in version 0.2.4
-- uses kfontdialog to set the font of the editor widget
+- uses tdefontdialog to set the font of the editor widget
- you may select an URL in your text and press the right mouse button
to execute a program with this URL. The program to execute is
configurable for http and ftp URLs.
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index 95fe7d7..4d42209 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -24,7 +24,7 @@
#include <tdeio/netaccess.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <kbookmarkmenu.h>
#include <tdeconfigdialog.h>
@@ -34,10 +34,10 @@
#include <kglobalsettings.h>
#include <kinputdialog.h>
#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <krun.h>
#include <kstandarddirs.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <ktextbrowser.h>
#include "KJotsMain.h"
diff --git a/kjots/KJotsMain.h b/kjots/KJotsMain.h
index 565ab32..0f24e5a 100644
--- a/kjots/KJotsMain.h
+++ b/kjots/KJotsMain.h
@@ -27,7 +27,7 @@
#include <tqpushbutton.h>
#include <kdialogbase.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
class TQGroupBox;
class TQWidgetStack;
diff --git a/kjots/confpagefont.ui b/kjots/confpagefont.ui
index c82914e..75bfcb8 100644
--- a/kjots/confpagefont.ui
+++ b/kjots/confpagefont.ui
@@ -33,6 +33,6 @@
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>kfontdialog.h</includehint>
+ <includehint>tdefontdialog.h</includehint>
</includehints>
</UI>
diff --git a/kjots/kjotsedit.cpp b/kjots/kjotsedit.cpp
index f6be76f..29fe021 100644
--- a/kjots/kjotsedit.cpp
+++ b/kjots/kjotsedit.cpp
@@ -24,7 +24,7 @@
#include <tqpaintdevicemetrics.h>
#include <tqcursor.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <keditcl.h>
#include <klocale.h>
#include <kopenwith.h>
diff --git a/kjots/kjotsentry.h b/kjots/kjotsentry.h
index d80a219..45c165d 100644
--- a/kjots/kjotsentry.h
+++ b/kjots/kjotsentry.h
@@ -23,7 +23,7 @@
#ifndef __KJOTSENTRY_H
#define __KJOTSENTRY_H
-#include <klistview.h>
+#include <tdelistview.h>
#include <kprinter.h>
//