diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:03:10 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:03:10 -0600 |
| commit | 782ea254f2b2cc59c01c9fa9c26df3262b05648a (patch) | |
| tree | ea2570417efdc330ee127513e1ca90180ab59311 /ktouch | |
| parent | c7c2e1330f7496d86e25cd9e408ae9f62f2d9bcb (diff) | |
| download | tdeedu-782ea254f2b2cc59c01c9fa9c26df3262b05648a.tar.gz tdeedu-782ea254f2b2cc59c01c9fa9c26df3262b05648a.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'ktouch')
| -rw-r--r-- | ktouch/src/ktouch.cpp | 4 | ||||
| -rw-r--r-- | ktouch/src/ktouchcolorscheme.cpp | 2 | ||||
| -rw-r--r-- | ktouch/src/ktouchkeyboard.cpp | 2 | ||||
| -rw-r--r-- | ktouch/src/ktouchkeyboardeditor.cpp | 2 | ||||
| -rw-r--r-- | ktouch/src/ktouchkeyboardwidget.cpp | 2 | ||||
| -rw-r--r-- | ktouch/src/ktouchlecture.cpp | 2 | ||||
| -rw-r--r-- | ktouch/src/ktouchlectureeditor.cpp | 2 | ||||
| -rw-r--r-- | ktouch/src/ktouchopenrequest.cpp | 2 | ||||
| -rw-r--r-- | ktouch/src/ktouchstatisticsdata.cpp | 2 | ||||
| -rw-r--r-- | ktouch/src/prefs.kcfgc | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp index 278ad3fe..4a3fa700 100644 --- a/ktouch/src/ktouch.cpp +++ b/ktouch/src/ktouch.cpp @@ -27,13 +27,13 @@ // KDE Header #include <klocale.h> #include <kstatusbar.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kaction.h> #include <kstandarddirs.h> #include <kmessagebox.h> #include <kdebug.h> #include <kpopupmenu.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kaction.h> #include <kcombobox.h> #include <kfontrequester.h> diff --git a/ktouch/src/ktouchcolorscheme.cpp b/ktouch/src/ktouchcolorscheme.cpp index 35def758..4a8d38f6 100644 --- a/ktouch/src/ktouchcolorscheme.cpp +++ b/ktouch/src/ktouchcolorscheme.cpp @@ -18,7 +18,7 @@ #include <kdebug.h> #include <klocale.h> #include <ktempfile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #define WRITE_COLOR(z,x,y) e = doc.createElement(x); \ n = doc.createTextNode( (y).name() ); \ diff --git a/ktouch/src/ktouchkeyboard.cpp b/ktouch/src/ktouchkeyboard.cpp index 8d9fd4b9..300b3482 100644 --- a/ktouch/src/ktouchkeyboard.cpp +++ b/ktouch/src/ktouchkeyboard.cpp @@ -16,7 +16,7 @@ #include <kdebug.h> #include <ktempfile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include "prefs.h" diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp index 40944155..ac51b005 100644 --- a/ktouch/src/ktouchkeyboardeditor.cpp +++ b/ktouch/src/ktouchkeyboardeditor.cpp @@ -17,7 +17,7 @@ #include <tqfont.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <ksqueezedtextlabel.h> #include <klineedit.h> diff --git a/ktouch/src/ktouchkeyboardwidget.cpp b/ktouch/src/ktouchkeyboardwidget.cpp index c5c1e88f..75edfb9e 100644 --- a/ktouch/src/ktouchkeyboardwidget.cpp +++ b/ktouch/src/ktouchkeyboardwidget.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <ktempfile.h> #include <klocale.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <kmessagebox.h> diff --git a/ktouch/src/ktouchlecture.cpp b/ktouch/src/ktouchlecture.cpp index 40a86007..6285a843 100644 --- a/ktouch/src/ktouchlecture.cpp +++ b/ktouch/src/ktouchlecture.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <klocale.h> #include <ktempfile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> bool KTouchLecture::load(TQWidget * window, const KURL& url) { // Ok, first download the contents as usual using the KIO lib diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp index 301b70b2..f8504c21 100644 --- a/ktouch/src/ktouchlectureeditor.cpp +++ b/ktouch/src/ktouchlectureeditor.cpp @@ -25,7 +25,7 @@ #include <kmessagebox.h> #include <kcombobox.h> #include <kfontdialog.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <algorithm> // for std::swap diff --git a/ktouch/src/ktouchopenrequest.cpp b/ktouch/src/ktouchopenrequest.cpp index 43d236f3..59f7e605 100644 --- a/ktouch/src/ktouchopenrequest.cpp +++ b/ktouch/src/ktouchopenrequest.cpp @@ -17,7 +17,7 @@ #include <kpushbutton.h> #include <klineedit.h> #include <kcombobox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <ksqueezedtextlabel.h> #include <kmessagebox.h> diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp index 88171722..67e1dac5 100644 --- a/ktouch/src/ktouchstatisticsdata.cpp +++ b/ktouch/src/ktouchstatisticsdata.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <klocale.h> #include <ktempfile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #ifdef HAVE_SSTREAM # include <sstream> diff --git a/ktouch/src/prefs.kcfgc b/ktouch/src/prefs.kcfgc index d5d5d7ba..8589875f 100644 --- a/ktouch/src/prefs.kcfgc +++ b/ktouch/src/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=ktouch.kcfg IncludeFiles=kglobalsettings.h ClassName=Prefs |