From 6c1d52c8248adb9189c944a28efde52330e99b66 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:21:28 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kmymoney2/kmymoney2.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'kmymoney2/kmymoney2.cpp') diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp index baf0db5..0bd0d2a 100644 --- a/kmymoney2/kmymoney2.cpp +++ b/kmymoney2/kmymoney2.cpp @@ -232,7 +232,7 @@ KMyMoney2App::KMyMoney2App(TQWidget * /*parent*/ , const char* name) : ::timetrace("done"); - connect(&proc,TQT_SIGNAL(processExited(KProcess *)),TQT_TQOBJECT(this), TQT_SLOT(slotProcessExited())); + connect(&proc,TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(slotProcessExited())); // force to show the home page if the file is closed connect(action("view_show_transaction_detail"), TQT_SIGNAL(toggled(bool)), myMoneyView, TQT_SLOT(slotShowTransactionDetail(bool))); @@ -369,7 +369,7 @@ void KMyMoney2App::initActions(void) #endif new KAction(i18n("Map to online account"), "news_subscribe", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountMapOnline()), actionCollection(), "account_online_map"); new KAction(i18n("Unmap account"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountUnmapOnline()), actionCollection(), "account_online_unmap"); - KActionMenu* menu = new KActionMenu(i18n("Update"), TQIconSet(KGlobal::iconLoader()->loadIcon("reload", KIcon::Small, + KActionMenu* menu = new KActionMenu(i18n("Update"), TQIconSet(TDEGlobal::iconLoader()->loadIcon("reload", KIcon::Small, KIcon::SizeSmall)), actionCollection(), "account_online_update_menu"); // activating the menu button is the same as selecting the current account connect( menu, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT(slotAccountUpdateOnline())); @@ -855,7 +855,7 @@ KURL KMyMoney2App::selectFile(const TQString& title, const TQString& _path, cons TQString path(_path); if(path.isEmpty()) - path = KGlobalSettings::documentPath(); + path = TDEGlobalSettings::documentPath(); KFileDialog* dialog = new KFileDialog(path, mask, this, title, true); dialog->setMode(mode); @@ -873,7 +873,7 @@ void KMyMoney2App::slotFileOpen(void) { KMSTATUS(i18n("Open a file.")); - KFileDialog* dialog = new KFileDialog(KGlobalSettings::documentPath(), + KFileDialog* dialog = new KFileDialog(TDEGlobalSettings::documentPath(), i18n("%1|KMyMoney files\n%2|All files (*.*)").arg("*.kmy *.xml").arg("*"), this, i18n("Open File..."), true); dialog->setMode(KFile::File | KFile::ExistingOnly); @@ -1477,7 +1477,7 @@ void KMyMoney2App::slotSaveAccountTemplates(void) { KMSTATUS(i18n("Exporting account templates.")); - TQString newName = KFileDialog::getSaveFileName(KGlobalSettings::documentPath(), + TQString newName = KFileDialog::getSaveFileName(TDEGlobalSettings::documentPath(), i18n("*.kmt|KMyMoney template files\n" "*.*|All files"), this, i18n("Save as...")); // @@ -1621,7 +1621,7 @@ void KMyMoney2App::slotGncImport(void) KMSTATUS(i18n("Importing a Gnucash file.")); - KFileDialog* dialog = new KFileDialog(KGlobalSettings::documentPath(), + KFileDialog* dialog = new KFileDialog(TDEGlobalSettings::documentPath(), i18n("%1|Gnucash files\n%2|All files (*.*)").arg("*").arg("*"), this, i18n("Import Gnucash file..."), true); dialog->setMode(KFile::File | KFile::ExistingOnly); @@ -1664,7 +1664,7 @@ void KMyMoney2App::slotStatementImport(void) bool result = false; KMSTATUS(i18n("Importing an XML Statement.")); - KFileDialog* dialog = new KFileDialog(KGlobalSettings::documentPath(), + KFileDialog* dialog = new KFileDialog(TDEGlobalSettings::documentPath(), i18n("%1|XML files\n%2|All files (*.*)").arg("*.xml").arg("*.*"), this, i18n("Import XML Statement..."), true); dialog->setMode(KFile::File | KFile::ExistingOnly); @@ -2408,7 +2408,7 @@ void KMyMoney2App::slotCategoryNew(MyMoneyAccount& account, const MyMoneyAccount } else { // we should not keep the 'no' setting because that can confuse people like // I have seen in some usability tests. So we just delete it right away. - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup(TQString::fromLatin1("Notification Messages")); kconfig->deleteEntry(TQString::fromLatin1("CreateNewCategories")); @@ -2582,7 +2582,7 @@ void KMyMoney2App::slotInvestmentDelete(void) } else { // we should not keep the 'no' setting because that can confuse people like // I have seen in some usability tests. So we just delete it right away. - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup(TQString::fromLatin1("Notification Messages")); kconfig->deleteEntry(TQString::fromLatin1("DeleteInvestment")); @@ -3515,7 +3515,7 @@ void KMyMoney2App::slotScheduleEdit(void) // than previous payment. Date would be // updated automatically so we probably // want to clear it. Let's ask the user. - if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered a scheduled transaction date of %1. Because the scheduled transaction was last paid on %2, KMyMoney will automatically adjust the scheduled transaction date to the next date unless the last payment date is reset. Do you want to reset the last payment date?").arg(KGlobal::locale()->formatDate(next, true)).arg(KGlobal::locale()->formatDate(last, true))+TQString(""),i18n("Reset Last Payment Date" ), KStdGuiItem::yes(), KStdGuiItem::no()) == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered a scheduled transaction date of %1. Because the scheduled transaction was last paid on %2, KMyMoney will automatically adjust the scheduled transaction date to the next date unless the last payment date is reset. Do you want to reset the last payment date?").arg(TDEGlobal::locale()->formatDate(next, true)).arg(TDEGlobal::locale()->formatDate(last, true))+TQString(""),i18n("Reset Last Payment Date" ), KStdGuiItem::yes(), KStdGuiItem::no()) == KMessageBox::Yes) { sched.setLastPayment( TQDate() ); } } @@ -3621,7 +3621,7 @@ void KMyMoney2App::slotScheduleSkip(void) if(!schedule.isFinished()) { if(schedule.occurence() != MyMoneySchedule::OCCUR_ONCE) { TQDate next = schedule.nextDueDate(); - if(!schedule.isFinished() && (KMessageBox::questionYesNo(this, TQString("")+i18n("Do you really want to skip the %1 transaction scheduled for %2?").arg(schedule.name(), KGlobal::locale()->formatDate(next, true))+TQString(""))) == KMessageBox::Yes) { + if(!schedule.isFinished() && (KMessageBox::questionYesNo(this, TQString("")+i18n("Do you really want to skip the %1 transaction scheduled for %2?").arg(schedule.name(), TDEGlobal::locale()->formatDate(next, true))+TQString(""))) == KMessageBox::Yes) { MyMoneyFileTransaction ft; schedule.setLastPayment(next); schedule.setNextDueDate(schedule.nextPayment(next)); @@ -3777,7 +3777,7 @@ void KMyMoney2App::slotPayeeNew(const TQString& newnameBase, TQString& id) doit = false; // we should not keep the 'no' setting because that can confuse people like // I have seen in some usability tests. So we just delete it right away. - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup(TQString::fromLatin1("Notification Messages")); kconfig->deleteEntry(dontAskAgain); @@ -5751,7 +5751,7 @@ void KMyMoney2App::slotCheckSchedules(void) void KMyMoney2App::writeLastUsedDir(const TQString& directory) { //get global config object for our app. - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup("General Options"); @@ -5764,7 +5764,7 @@ void KMyMoney2App::writeLastUsedDir(const TQString& directory) void KMyMoney2App::writeLastUsedFile(const TQString& fileName) { //get global config object for our app. - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup("General Options"); @@ -5781,16 +5781,16 @@ TQString KMyMoney2App::readLastUsedDir(void) const TQString str; //get global config object for our app. - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup("General Options"); //read path entry. Second parameter is the default if the setting is not found, which will be the default document path. - str = kconfig->readPathEntry("LastUsedDirectory", KGlobalSettings::documentPath()); + str = kconfig->readPathEntry("LastUsedDirectory", TDEGlobalSettings::documentPath()); // if the path stored is empty, we use the default nevertheless if(str.isEmpty()) - str = KGlobalSettings::documentPath(); + str = TDEGlobalSettings::documentPath(); } return str; @@ -5801,7 +5801,7 @@ TQString KMyMoney2App::readLastUsedFile(void) const TQString str; // get global config object for our app. - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup("General Options"); -- cgit v1.2.1