summaryrefslogtreecommitdiffstats
path: root/noatun-plugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:13:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:13:30 -0600
commit609724b5d29f25236bee59d0cb794602d391a96b (patch)
tree6a7cbc4d42a570e50e44ad782d9bc6cdee289edb /noatun-plugins
parentda2af448849a961235925b69430584d0bfe94b1f (diff)
downloadtdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.tar.gz
tdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'noatun-plugins')
-rw-r--r--noatun-plugins/nexscope/nex.cpp4
-rw-r--r--noatun-plugins/synaescope/main.cpp2
-rw-r--r--noatun-plugins/tippercanoe/main.cpp2
-rw-r--r--noatun-plugins/tyler/main.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp
index 0bcafbe..b7208b5 100644
--- a/noatun-plugins/nexscope/nex.cpp
+++ b/noatun-plugins/nexscope/nex.cpp
@@ -568,9 +568,9 @@ int main(int argc, char **argv)
runLock.lock();
#endif
- KAboutData aboutData("nex", I18N_NOOP("Nex"), "0.0.1",
+ TDEAboutData aboutData("nex", I18N_NOOP("Nex"), "0.0.1",
I18N_NOOP("The awesome customizable scope"),
- KAboutData::License_LGPL, "(C) 2001 Charles Samuels", 0,
+ TDEAboutData::License_LGPL, "(C) 2001 Charles Samuels", 0,
"http://noatun.kde.org");
aboutData.addAuthor("Charles Samuels", I18N_NOOP("Nex Author"),
diff --git a/noatun-plugins/synaescope/main.cpp b/noatun-plugins/synaescope/main.cpp
index 4b4a2a5..adbadaa 100644
--- a/noatun-plugins/synaescope/main.cpp
+++ b/noatun-plugins/synaescope/main.cpp
@@ -178,7 +178,7 @@ void warning(const char *str, bool)
int main(void)
{
- KInstance in("noatunsynaescope");
+ TDEInstance in("noatunsynaescope");
core = new Core;
diff --git a/noatun-plugins/tippercanoe/main.cpp b/noatun-plugins/tippercanoe/main.cpp
index 28a60ec..24e81b9 100644
--- a/noatun-plugins/tippercanoe/main.cpp
+++ b/noatun-plugins/tippercanoe/main.cpp
@@ -160,7 +160,7 @@ void warning(const char *, bool)
int main()
{
fcntl(STDIN_FILENO, F_SETFL, fcntl(STDIN_FILENO, F_GETFL) & ~O_NONBLOCK);
- KInstance in("noatunsynaescope");
+ TDEInstance in("noatunsynaescope");
core=new Core;
core->go();
delete core;
diff --git a/noatun-plugins/tyler/main.cpp b/noatun-plugins/tyler/main.cpp
index 219c6ed..40f639d 100644
--- a/noatun-plugins/tyler/main.cpp
+++ b/noatun-plugins/tyler/main.cpp
@@ -68,7 +68,7 @@ int main(int, char **)
atexit(SDL_Quit);
- KInstance in("noatuntyler");
+ TDEInstance in("noatuntyler");
finished = false;
access_mutex = SDL_CreateMutex();