diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:03:10 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:03:10 -0600 |
| commit | 782ea254f2b2cc59c01c9fa9c26df3262b05648a (patch) | |
| tree | ea2570417efdc330ee127513e1ca90180ab59311 /kanagram/src | |
| 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 'kanagram/src')
| -rw-r--r-- | kanagram/src/kanagram.cpp | 6 | ||||
| -rw-r--r-- | kanagram/src/keduvocdocument.cpp | 2 | ||||
| -rw-r--r-- | kanagram/src/mainsettings.cpp | 6 | ||||
| -rw-r--r-- | kanagram/src/newstuffdialog.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp index 87ce672c..4d9dca18 100644 --- a/kanagram/src/kanagram.cpp +++ b/kanagram/src/kanagram.cpp @@ -34,15 +34,15 @@ using namespace std; #include <kaction.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <khelpmenu.h> #include <kinputdialog.h> #include <klocale.h> #include <kmessagebox.h> #include <kpopupmenu.h> #include <kstandarddirs.h> -#include <kconfigdialog.h> -#include <kconfigskeleton.h> +#include <tdeconfigdialog.h> +#include <tdeconfigskeleton.h> #include <krandomsequence.h> #include <kdebug.h> diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp index ffb95e2d..623a414d 100644 --- a/kanagram/src/keduvocdocument.cpp +++ b/kanagram/src/keduvocdocument.cpp @@ -22,7 +22,7 @@ #include <klocale.h> #include <kdebug.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqfileinfo.h> diff --git a/kanagram/src/mainsettings.cpp b/kanagram/src/mainsettings.cpp index 0e14a207..07651e56 100644 --- a/kanagram/src/mainsettings.cpp +++ b/kanagram/src/mainsettings.cpp @@ -25,12 +25,12 @@ #include <tqpushbutton.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "mainsettings.h" #include "kanagramsettings.h" diff --git a/kanagram/src/newstuffdialog.cpp b/kanagram/src/newstuffdialog.cpp index a9558de1..1d3ed4b9 100644 --- a/kanagram/src/newstuffdialog.cpp +++ b/kanagram/src/newstuffdialog.cpp @@ -3,7 +3,7 @@ #include <knewstuff/knewstuff.h> #include <knewstuff/entry.h> #include <klocale.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurl.h> #include <kstandarddirs.h> |