diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:39 -0600 |
| commit | ff94d46e423398804d2ae63faeb114c2cf604fc4 (patch) | |
| tree | 4481ffd491d15ac15081cea46d7cc298ef6351a4 /kapptemplate | |
| parent | b9553cef2a3cd9f5b89c8aca6f4b7781a079dbb7 (diff) | |
| download | tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.tar.gz tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kapptemplate')
| -rw-r--r-- | kapptemplate/kapp/app.cpp | 6 | ||||
| -rw-r--r-- | kapptemplate/kpartapp/app.cpp | 4 | ||||
| -rw-r--r-- | kapptemplate/kpartapp/app_part.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp index 7f69e8e8..df8cc8ed 100644 --- a/kapptemplate/kapp/app.cpp +++ b/kapptemplate/kapp/app.cpp @@ -20,9 +20,9 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp #include <kmenubar.h> #include <kstatusbar.h> #include <kaccel.h> -#include <kio/netaccess.h> -#include <kfiledialog.h> -#include <kconfig.h> +#include <tdeio/netaccess.h> +#include <tdefiledialog.h> +#include <tdeconfig.h> #include <kurl.h> #include <kurldrag.h> #include <kurlrequesterdlg.h> diff --git a/kapptemplate/kpartapp/app.cpp b/kapptemplate/kpartapp/app.cpp index 77beb4fc..be995d83 100644 --- a/kapptemplate/kpartapp/app.cpp +++ b/kapptemplate/kpartapp/app.cpp @@ -9,7 +9,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp #include "${APP_NAME_LC}.moc" #include <kkeydialog.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurl.h> #include <kedittoolbar.h> @@ -19,7 +19,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp #include <klibloader.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kstatusbar.h> ${APP_NAME}::${APP_NAME}() diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp index 07843be0..7ef6e964 100644 --- a/kapptemplate/kpartapp/app_part.cpp +++ b/kapptemplate/kpartapp/app_part.cpp @@ -7,7 +7,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.cpp #include <kinstance.h> #include <kaction.h> #include <kstdaction.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tdeparts/genericfactory.h> #include <tqfile.h> |