diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
commit | c48e769eb275917717e2b55eb869f7e559293ac8 (patch) | |
tree | 8f650b907e21c918b826f854dbe1c8174cc2c0c6 /kppp/accounting.cpp | |
parent | 8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff) | |
download | tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kppp/accounting.cpp')
-rw-r--r-- | kppp/accounting.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kppp/accounting.cpp b/kppp/accounting.cpp index 76c5f02e..7f346eef 100644 --- a/kppp/accounting.cpp +++ b/kppp/accounting.cpp @@ -77,7 +77,7 @@ AccountingBase::AccountingBase(TQObject *parent) : .arg(TQDate::shortMonthName(dt.month())) .arg(dt.year(), 4); - LogFileName = KGlobal::dirs()->saveLocation("appdata", "Log") + LogFileName = TDEGlobal::dirs()->saveLocation("appdata", "Log") + "/" + LogFileName; kdDebug(5002) << "LogFileName: " << LogFileName << endl; @@ -156,7 +156,7 @@ TQString AccountingBase::getCosts(const TQString & accountname) { gpppdata.setAccount(accountname); TQString val = gpppdata.totalCosts(); // ### currency from rule file - // TQString val = KGlobal::locale()->formatMoney(gpppdata.totalCosts().toDouble(), currency); + // TQString val = TDEGlobal::locale()->formatMoney(gpppdata.totalCosts().toDouble(), currency); gpppdata.setAccount(prev_account); @@ -377,7 +377,7 @@ bool ExecutableAccounting::loadRuleSet(const TQString &) { } -void ExecutableAccounting::gotData(KProcess */*proc*/, char *buffer, int /*buflen*/) { +void ExecutableAccounting::gotData(TDEProcess */*proc*/, char *buffer, int /*buflen*/) { TQString field[8]; int nFields = 0; int pos, last_pos = 0; @@ -434,13 +434,13 @@ void ExecutableAccounting::slotStart() { loadCosts(); TQString s = AccountingBase::getAccountingFile(gpppdata.accountingFile()); - proc = new KProcess; + proc = new TDEProcess; TQString s_total; s_total.sprintf("%0.8f", total()); *proc << s << s_total; - connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(gotData(KProcess *, char *, int))); + connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(gotData(TDEProcess *, char *, int))); proc->start(); time_t start_time = time(0); |