From 6078e14f28ec3b34cc2041cbd8628a1d8420512c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:08:33 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kmymoney2/views/kaccountsview.cpp | 4 ++-- kmymoney2/views/kforecastview.cpp | 4 ++-- kmymoney2/views/kmymoneyview.cpp | 12 ++++++------ kmymoney2/views/kpayeesview.cpp | 4 ++-- kmymoney2/views/kscheduledview.cpp | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'kmymoney2/views') diff --git a/kmymoney2/views/kaccountsview.cpp b/kmymoney2/views/kaccountsview.cpp index 0e472ae..cff2805 100644 --- a/kmymoney2/views/kaccountsview.cpp +++ b/kmymoney2/views/kaccountsview.cpp @@ -97,7 +97,7 @@ KAccountsView::KAccountsView(TQWidget *parent, const char *name) : for(int i=0; i < MaxViewTabs; ++i) m_needReload[i] = false; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); m_tab->setCurrentPage(config->readNumEntry("KAccountsView_LastType", 0)); @@ -142,7 +142,7 @@ void KAccountsView::slotTabChanged(TQWidget* _tab) AccountsViewTab tab = static_cast(m_tab->indexOf(_tab)); // remember this setting for startup - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("KAccountsView_LastType", tab); diff --git a/kmymoney2/views/kforecastview.cpp b/kmymoney2/views/kforecastview.cpp index 88e5afb..cd0f5f5 100644 --- a/kmymoney2/views/kforecastview.cpp +++ b/kmymoney2/views/kforecastview.cpp @@ -52,7 +52,7 @@ KForecastView::KForecastView(TQWidget *parent, const char *name) : for(int i=0; i < MaxViewTabs; ++i) m_needReload[i] = false; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); m_tab->setCurrentPage(config->readNumEntry("KForecastView_LastType", 0)); @@ -83,7 +83,7 @@ void KForecastView::slotTabChanged(TQWidget* _tab) ForecastViewTab tab = static_cast(m_tab->indexOf(_tab)); // remember this setting for startup - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("KForecastView_LastType", tab); diff --git a/kmymoney2/views/kmymoneyview.cpp b/kmymoney2/views/kmymoneyview.cpp index a6c8f34..1a4136c 100644 --- a/kmymoney2/views/kmymoneyview.cpp +++ b/kmymoney2/views/kmymoneyview.cpp @@ -581,10 +581,10 @@ bool KMyMoneyView::readFile(const KURL& url) filename = url.path(); } else { - if(!KIO::NetAccess::download(url, filename, NULL)) { + if(!TDEIO::NetAccess::download(url, filename, NULL)) { KMessageBox::detailedError(this, i18n("Error while loading file '%1'!").arg(url.url()), - KIO::NetAccess::lastErrorString(), + TDEIO::NetAccess::lastErrorString(), i18n("File access error")); return false; } @@ -771,7 +771,7 @@ bool KMyMoneyView::readFile(const KURL& url) // if a temporary file was constructed by NetAccess::download, // then it will be removed with the next call. Otherwise, it // stays untouched on the local filesystem - KIO::NetAccess::removeTempFile(filename); + TDEIO::NetAccess::removeTempFile(filename); return initializeStorage(); } @@ -890,7 +890,7 @@ bool KMyMoneyView::initializeStorage() selectBaseCurrency(); } - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); int page; config->setGroup("General Options"); if(KMyMoneyGlobalSettings::startLastViewSelected() != 0) { @@ -1154,7 +1154,7 @@ bool KMyMoneyView::saveFile(const KURL& url, const TQString& keyList) } else { KTempFile tmpfile; saveToLocalFile(tmpfile.file(), pWriter, plaintext, keyList); - if(!KIO::NetAccess::upload(tmpfile.name(), url, NULL)) + if(!TDEIO::NetAccess::upload(tmpfile.name(), url, NULL)) throw new MYMONEYEXCEPTION(i18n("Unable to upload to '%1'").arg(url.url())); tmpfile.unlink(); } @@ -1630,7 +1630,7 @@ void KMyMoneyView::progressCallback(int current, int total, const TQString& msg) void KMyMoneyView::slotRememberPage(TQWidget* w) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("LastViewSelected", pageIndex(w)); config->sync(); diff --git a/kmymoney2/views/kpayeesview.cpp b/kmymoney2/views/kpayeesview.cpp index 43404c0..e600c45 100644 --- a/kmymoney2/views/kpayeesview.cpp +++ b/kmymoney2/views/kpayeesview.cpp @@ -336,7 +336,7 @@ KPayeesView::KPayeesView(TQWidget *parent, const char *name ) : layout10->addWidget(m_splitter); // use the size settings of the last run (if any) - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); TQValueList sizes = config->readIntListEntry("KPayeesViewSplitterSize"); if(sizes.size() == 2) { @@ -409,7 +409,7 @@ KPayeesView::KPayeesView(TQWidget *parent, const char *name ) : KPayeesView::~KPayeesView() { // remember the splitter settings for startup - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("KPayeesViewSplitterSize", m_splitter->sizes()); } diff --git a/kmymoney2/views/kscheduledview.cpp b/kmymoney2/views/kscheduledview.cpp index 2635d7d..26df1ac 100644 --- a/kmymoney2/views/kscheduledview.cpp +++ b/kmymoney2/views/kscheduledview.cpp @@ -309,7 +309,7 @@ void KScheduledView::slotRearrange(void) void KScheduledView::readConfig(void) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); m_openBills = config->readBoolEntry("KScheduleView_openBills", true); m_openDeposits = config->readBoolEntry("KScheduleView_openDeposits", true); @@ -324,7 +324,7 @@ void KScheduledView::readConfig(void) void KScheduledView::writeConfig(void) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("KScheduleView_openBills", m_openBills); config->writeEntry("KScheduleView_openDeposits", m_openDeposits); -- cgit v1.2.1