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/widgets/kmymoneycombo.cpp | 2 +- kmymoney2/widgets/kmymoneyedit.cpp | 8 ++++---- kmymoney2/widgets/kmymoneygpgconfig.cpp | 2 +- kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp | 2 +- kmymoney2/widgets/kmymoneypriceview.cpp | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kmymoney2/widgets') diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp index d637808..56c7e31 100644 --- a/kmymoney2/widgets/kmymoneycombo.cpp +++ b/kmymoney2/widgets/kmymoneycombo.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include // ---------------------------------------------------------------------------- // Project Includes diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp index fe086b9..032c3f5 100644 --- a/kmymoney2/widgets/kmymoneyedit.cpp +++ b/kmymoney2/widgets/kmymoneyedit.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include // ---------------------------------------------------------------------------- // Project Includes @@ -235,9 +235,9 @@ void kMyMoneyEdit::init(void) m_resetButton->setEnabled(false); m_resetButton->setFocusProxy(m_edit); - TDEConfig *kconfig = TDEGlobal::config(); - kconfig->setGroup("General Options"); - if(kconfig->readBoolEntry("DontShowCalculatorButton", false) == true) + TDEConfig *tdeconfig = TDEGlobal::config(); + tdeconfig->setGroup("General Options"); + if(tdeconfig->readBoolEntry("DontShowCalculatorButton", false) == true) setCalculatorButtonVisible(false); setSpacing(0); diff --git a/kmymoney2/widgets/kmymoneygpgconfig.cpp b/kmymoney2/widgets/kmymoneygpgconfig.cpp index df67d27..afc7d6b 100644 --- a/kmymoney2/widgets/kmymoneygpgconfig.cpp +++ b/kmymoney2/widgets/kmymoneygpgconfig.cpp @@ -24,7 +24,7 @@ // ---------------------------------------------------------------------------- // KDE Includes -#include +#include #include #include #include diff --git a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp index 738749f..dbc6b35 100644 --- a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp +++ b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp @@ -23,7 +23,7 @@ // ---------------------------------------------------------------------------- // KDE Includes -#include +#include #include #include #include diff --git a/kmymoney2/widgets/kmymoneypriceview.cpp b/kmymoney2/widgets/kmymoneypriceview.cpp index f9c922c..e1dd25e 100644 --- a/kmymoney2/widgets/kmymoneypriceview.cpp +++ b/kmymoney2/widgets/kmymoneypriceview.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include // ---------------------------------------------------------------------------- @@ -66,9 +66,9 @@ KMyMoneyPriceItem::KMyMoneyPriceItem(KListView *view, const MyMoneyPrice& pr) : m_pr(pr) { MyMoneySecurity from, to; - TDEConfig *kconfig = TDEGlobal::config(); - kconfig->setGroup("General Options"); - int prec = kconfig->readNumEntry("PricePrecision", 4); + TDEConfig *tdeconfig = TDEGlobal::config(); + tdeconfig->setGroup("General Options"); + int prec = tdeconfig->readNumEntry("PricePrecision", 4); if(!m_pr.isValid()) m_pr = MyMoneyFile::instance()->price(m_pr.from(), m_pr.to(), m_pr.date()); -- cgit v1.2.1