From fe50f29e05b1318b520a33179ea50c88b6e2c89a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 00:53:39 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kmymoney2/wizards/newuserwizard/Makefile.am | 6 +- kmymoney2/wizards/newuserwizard/kfilepagedecl.ui | 86 ---------------------- kmymoney2/wizards/newuserwizard/knewuserwizard.cpp | 2 +- kmymoney2/wizards/newuserwizard/knewuserwizard_p.h | 2 +- kmymoney2/wizards/newuserwizard/tdefilepagedecl.ui | 86 ++++++++++++++++++++++ 5 files changed, 91 insertions(+), 91 deletions(-) delete mode 100644 kmymoney2/wizards/newuserwizard/kfilepagedecl.ui create mode 100644 kmymoney2/wizards/newuserwizard/tdefilepagedecl.ui (limited to 'kmymoney2/wizards/newuserwizard') 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/kfilepagedecl.ui b/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui deleted file mode 100644 index 316902a..0000000 --- a/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui +++ /dev/null @@ -1,86 +0,0 @@ - -KFilePageDecl - - - KFilePageDecl - - - - 0 - 0 - 600 - 350 - - - - - unnamed - - - - kActiveLabel1 - - - NoFocus - - - KMyMoney will store your financial data in a file on the disk. A standard filename within your KDE user environment will be the default. This is just provided for convenience and you can choose any other location here. - - - - - m_dataFileEdit - - - - - spacer1 - - - Vertical - - - Expanding - - - - 20 - 30 - - - - - - m_existingFileLabel - - - - 255 - 0 - 0 - - - - Either the currently selected file exists or the selected directory does not exist. Please make sure, that - -<ul> -<li>the selected directory exists and</li> -<li>the filename is not currently used in this directory.</li> -</ul> - - - - - m_finishLabel - - - NoFocus - - - This finishes the setup of your KMyMoney environment. You can now press the Finish button and start using KMyMoney to record your financial transactions. - - - - - - 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 #include #include -#include +#include #include #include #include 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/tdefilepagedecl.ui b/kmymoney2/wizards/newuserwizard/tdefilepagedecl.ui new file mode 100644 index 0000000..316902a --- /dev/null +++ b/kmymoney2/wizards/newuserwizard/tdefilepagedecl.ui @@ -0,0 +1,86 @@ + +KFilePageDecl + + + KFilePageDecl + + + + 0 + 0 + 600 + 350 + + + + + unnamed + + + + kActiveLabel1 + + + NoFocus + + + KMyMoney will store your financial data in a file on the disk. A standard filename within your KDE user environment will be the default. This is just provided for convenience and you can choose any other location here. + + + + + m_dataFileEdit + + + + + spacer1 + + + Vertical + + + Expanding + + + + 20 + 30 + + + + + + m_existingFileLabel + + + + 255 + 0 + 0 + + + + Either the currently selected file exists or the selected directory does not exist. Please make sure, that + +<ul> +<li>the selected directory exists and</li> +<li>the filename is not currently used in this directory.</li> +</ul> + + + + + m_finishLabel + + + NoFocus + + + This finishes the setup of your KMyMoney environment. You can now press the Finish button and start using KMyMoney to record your financial transactions. + + + + + + -- cgit v1.2.1