diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:53:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:53:39 -0600 |
| commit | fe50f29e05b1318b520a33179ea50c88b6e2c89a (patch) | |
| tree | 2a697d17f25d06389c2908e79c4b191e5b6c971d /kmymoney2/wizards/newuserwizard | |
| parent | 9311d363bfabf7f1105e3339922169d89107a724 (diff) | |
| download | kmymoney-fe50f29e05b1318b520a33179ea50c88b6e2c89a.tar.gz kmymoney-fe50f29e05b1318b520a33179ea50c88b6e2c89a.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kmymoney2/wizards/newuserwizard')
| -rw-r--r-- | kmymoney2/wizards/newuserwizard/Makefile.am | 6 | ||||
| -rw-r--r-- | kmymoney2/wizards/newuserwizard/knewuserwizard.cpp | 2 | ||||
| -rw-r--r-- | kmymoney2/wizards/newuserwizard/knewuserwizard_p.h | 2 | ||||
| -rw-r--r-- | kmymoney2/wizards/newuserwizard/tdefilepagedecl.ui (renamed from kmymoney2/wizards/newuserwizard/kfilepagedecl.ui) | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kmymoney2/wizards/newuserwizard/Makefile.am b/kmymoney2/wizards/newuserwizard/Makefile.am index 36b9fdd..82becfb 100644 --- a/kmymoney2/wizards/newuserwizard/Makefile.am +++ b/kmymoney2/wizards/newuserwizard/Makefile.am @@ -5,11 +5,11 @@ INCLUDES = $(all_includes) -I../wizardpages -I$(top_srcdir) -I. libnewuserwizard_a_METASOURCES = AUTO -libnewuserwizard_a_SOURCES = knewuserwizard.cpp kgeneralpagedecl.ui kcurrencypagedecl.ui kpasswordpagedecl.ui kaccountpagedecl.ui kpreferencepagedecl.ui kfilepagedecl.ui kintropagedecl.ui +libnewuserwizard_a_SOURCES = knewuserwizard.cpp kgeneralpagedecl.ui kcurrencypagedecl.ui kpasswordpagedecl.ui kaccountpagedecl.ui kpreferencepagedecl.ui tdefilepagedecl.ui kintropagedecl.ui -EXTRA_DIST = kgeneralpagedecl.ui kcurrencypagedecl.ui kpasswordpagedecl.ui kaccountpagedecl.ui kpreferencepagedecl.ui kfilepagedecl.ui kintropagedecl.ui +EXTRA_DIST = kgeneralpagedecl.ui kcurrencypagedecl.ui kpasswordpagedecl.ui kaccountpagedecl.ui kpreferencepagedecl.ui tdefilepagedecl.ui kintropagedecl.ui -DISTCLEANFILES= kgeneralpagedecl.cpp kgeneralpagedecl.h kcurrencypagedecl.cpp kcurrencypagedecl.h kpasswordpagedecl.cpp kpasswordpagedecl.h kaccountpagedecl.cpp kaccountpagedecl.h kpreferencepagedecl.cpp kpreferencepagedecl.h kfilepagedecl.cpp kfilepagedecl.h kintropagedecl.cpp kintropagedecl.h +DISTCLEANFILES= kgeneralpagedecl.cpp kgeneralpagedecl.h kcurrencypagedecl.cpp kcurrencypagedecl.h kpasswordpagedecl.cpp kpasswordpagedecl.h kaccountpagedecl.cpp kaccountpagedecl.h kpreferencepagedecl.cpp kpreferencepagedecl.h tdefilepagedecl.cpp tdefilepagedecl.h kintropagedecl.cpp kintropagedecl.h noinst_HEADERS = knewuserwizard.h knewuserwizard_p.h diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp index e9dd204..050e5fd 100644 --- a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp +++ b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp @@ -37,7 +37,7 @@ #include <ktextedit.h> #include <kuser.h> #include <kurlrequester.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurl.h> #include <kabc/addressee.h> #include <kabc/stdaddressbook.h> diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h b/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h index 8431f06..9542c07 100644 --- a/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h +++ b/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h @@ -29,7 +29,7 @@ #include "kintropagedecl.h" #include "kaccountpagedecl.h" #include "kpreferencepagedecl.h" -#include "kfilepagedecl.h" +#include "tdefilepagedecl.h" #include "../wizardpages/userinfo.h" #include "../wizardpages/currency.h" diff --git a/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui b/kmymoney2/wizards/newuserwizard/tdefilepagedecl.ui index 316902a..316902a 100644 --- a/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/tdefilepagedecl.ui |