diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:13 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:13 -0600 |
| commit | 2fb700f92bb787fab0845a63a541cd5640daa449 (patch) | |
| tree | c6f769db55585dd47a9fd415a40ee8b86926f683 /parts/appwizard | |
| parent | fd1d1e1064eb09ddbbd67d3597c39856f5c0bc76 (diff) | |
| download | tdevelop-2fb700f92bb787fab0845a63a541cd5640daa449.tar.gz tdevelop-2fb700f92bb787fab0845a63a541cd5640daa449.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'parts/appwizard')
| -rw-r--r-- | parts/appwizard/appwizarddlg.cpp | 2 | ||||
| -rw-r--r-- | parts/appwizard/common/incadmin/ltmain.sh | 2 | ||||
| -rw-r--r-- | parts/appwizard/importdlg.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index d9725ba4..11552b27 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -51,7 +51,7 @@ #include <kpopupmenu.h> #include <ktrader.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kio/netaccess.h> #include <tqfile.h> #include <kmacroexpander.h> diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh index 3506ead3..f5fb19b4 100644 --- a/parts/appwizard/common/incadmin/ltmain.sh +++ b/parts/appwizard/common/incadmin/ltmain.sh @@ -7148,7 +7148,7 @@ EOF k=1 if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + output=${output_objdir}/${output_la}.lntdescript func_verbose "creating GNU ld script: $output" $ECHO 'INPUT (' > $output for obj in $save_libobjs diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index c0d05a77..34b5422c 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -34,7 +34,7 @@ #include <kfile.h> #include <kurlrequester.h> #include <ktrader.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kprocess.h> #include "kdevcore.h" |