summaryrefslogtreecommitdiffstats
path: root/kmymoney2/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'kmymoney2/widgets')
-rw-r--r--kmymoney2/widgets/kaccounttemplateselector.cpp12
-rw-r--r--kmymoney2/widgets/kbudgetvalues.cpp2
-rw-r--r--kmymoney2/widgets/kmymoneyaccounttree.cpp2
-rw-r--r--kmymoney2/widgets/kmymoneyaccounttreebase.cpp4
-rw-r--r--kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp2
-rw-r--r--kmymoney2/widgets/kmymoneybriefschedule.cpp6
-rw-r--r--kmymoney2/widgets/kmymoneycalculator.cpp6
-rw-r--r--kmymoney2/widgets/kmymoneycalendar.cpp6
-rw-r--r--kmymoney2/widgets/kmymoneycalendar.h4
-rw-r--r--kmymoney2/widgets/kmymoneycategory.cpp2
-rw-r--r--kmymoney2/widgets/kmymoneydateinput.cpp8
-rw-r--r--kmymoney2/widgets/kmymoneydatetbl.cpp38
-rw-r--r--kmymoney2/widgets/kmymoneydatetbl.h4
-rw-r--r--kmymoney2/widgets/kmymoneyedit.cpp12
-rw-r--r--kmymoney2/widgets/kmymoneygpgconfig.cpp4
-rw-r--r--kmymoney2/widgets/kmymoneylineedit.cpp8
-rw-r--r--kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp2
-rw-r--r--kmymoney2/widgets/kmymoneypriceview.cpp6
-rw-r--r--kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp30
-rw-r--r--kmymoney2/widgets/kmymoneytitlelabel.cpp10
-rw-r--r--kmymoney2/widgets/kmymoneywizard.cpp6
-rw-r--r--kmymoney2/widgets/register.cpp6
-rw-r--r--kmymoney2/widgets/transaction.cpp10
-rw-r--r--kmymoney2/widgets/transactionsortoption.ui.h2
24 files changed, 96 insertions, 96 deletions
diff --git a/kmymoney2/widgets/kaccounttemplateselector.cpp b/kmymoney2/widgets/kaccounttemplateselector.cpp
index 430c2dc..badcdff 100644
--- a/kmymoney2/widgets/kaccounttemplateselector.cpp
+++ b/kmymoney2/widgets/kaccounttemplateselector.cpp
@@ -180,7 +180,7 @@ void KAccountTemplateSelector::slotLoadTemplateList(void)
#ifndef KMM_DESIGNER
TQStringList dirs;
// get list of template subdirs and scan them for the list of subdirs
- d->dirlist = KGlobal::dirs()->findDirs("appdata", "templates");
+ d->dirlist = TDEGlobal::dirs()->findDirs("appdata", "templates");
TQStringList::iterator it;
for(it = d->dirlist.begin(); it != d->dirlist.end(); ++it) {
TQDir dir(*it);
@@ -193,16 +193,16 @@ void KAccountTemplateSelector::slotLoadTemplateList(void)
continue;
TQRegExp exp("(..)_(..)");
if(exp.search(*it_d) != -1) {
- TQString country = KGlobal::locale()->twoAlphaToCountryName(exp.cap(2));
+ TQString country = TDEGlobal::locale()->twoAlphaToCountryName(exp.cap(2));
if(country.isEmpty())
country = exp.cap(2);
- TQString lang = KGlobal::locale()->twoAlphaToLanguageName(exp.cap(1));
+ TQString lang = TDEGlobal::locale()->twoAlphaToLanguageName(exp.cap(1));
if(d->countries.contains(country)) {
if(d->countries[country] != *it_d) {
TQString oName = d->countries[country];
exp.search(oName);
- TQString oCountry = KGlobal::locale()->twoAlphaToCountryName(exp.cap(2));
- TQString oLang = KGlobal::locale()->twoAlphaToLanguageName(exp.cap(1));
+ TQString oCountry = TDEGlobal::locale()->twoAlphaToCountryName(exp.cap(2));
+ TQString oLang = TDEGlobal::locale()->twoAlphaToLanguageName(exp.cap(1));
d->countries.remove(country);
d->countries[TQString("%1 (%2)").arg(oCountry).arg(oLang)] = oName;
d->countries[TQString("%1 (%2)").arg(country).arg(lang)] = *it_d;
@@ -211,7 +211,7 @@ void KAccountTemplateSelector::slotLoadTemplateList(void)
d->countries[country] = *it_d;
}
} else if((*it_d).length() == 2) {
- TQString country = KGlobal::locale()->twoAlphaToCountryName((*it_d).upper());
+ TQString country = TDEGlobal::locale()->twoAlphaToCountryName((*it_d).upper());
d->countries[country] = *it_d;
} else {
tqDebug("'%s/%s' not scanned", (*it).data(), (*it_d).data());
diff --git a/kmymoney2/widgets/kbudgetvalues.cpp b/kmymoney2/widgets/kbudgetvalues.cpp
index df665a8..1ee3520 100644
--- a/kmymoney2/widgets/kbudgetvalues.cpp
+++ b/kmymoney2/widgets/kbudgetvalues.cpp
@@ -253,7 +253,7 @@ void KBudgetValues::fillMonthLabels(void)
{
TQDate date(m_budgetDate);
for(int i = 0; i < 12; ++i) {
- m_label[i]->setText(KGlobal::locale()->calendar()->monthName(date, true));
+ m_label[i]->setText(TDEGlobal::locale()->calendar()->monthName(date, true));
date = date.addMonths(1);
}
}
diff --git a/kmymoney2/widgets/kmymoneyaccounttree.cpp b/kmymoney2/widgets/kmymoneyaccounttree.cpp
index e89553b..c3a9895 100644
--- a/kmymoney2/widgets/kmymoneyaccounttree.cpp
+++ b/kmymoney2/widgets/kmymoneyaccounttree.cpp
@@ -88,7 +88,7 @@ void KMyMoneyAccountTreeItem::fillColumns()
if (!lv)
return;
KMyMoneyAccountTreeBaseItem::fillColumns();
- TQPixmap checkMark = TQPixmap(KGlobal::iconLoader()->loadIcon("ok", KIcon::Small));
+ TQPixmap checkMark = TQPixmap(TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small));
MyMoneyMoney vatRate;
if (!isInstitution())
setPixmap(lv->nameColumn(), m_account.accountPixmap(m_reconcileFlag, 22));
diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp
index fc08cdc..fa8b5ed 100644
--- a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp
+++ b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp
@@ -94,7 +94,7 @@ KMyMoneyAccountTreeBase::KMyMoneyAccountTreeBase(TQWidget* parent, const char* n
KMyMoneyAccountTreeBase::~KMyMoneyAccountTreeBase()
{
if (!m_configGroup.isEmpty())
- saveLayout(KGlobal::config(), m_configGroup);
+ saveLayout(TDEGlobal::config(), m_configGroup);
}
void KMyMoneyAccountTreeBase::restoreLayout(const TQString& group)
@@ -105,7 +105,7 @@ void KMyMoneyAccountTreeBase::restoreLayout(const TQString& group)
// we use equal distribution of all fields as an initial setting
// TODO this only makes the first column invisible if settings exist setColumnWidth(0, 0);
m_configGroup = group;
- KListView::restoreLayout(KGlobal::config(), m_configGroup);
+ KListView::restoreLayout(TDEGlobal::config(), m_configGroup);
}
void KMyMoneyAccountTreeBase::showType(void)
diff --git a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
index d7584c5..d0903d2 100644
--- a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
+++ b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
@@ -85,7 +85,7 @@ void KMyMoneyAccountTreeForecast::showDetailed(MyMoneyForecast& forecast)
for(int i = 1; i <= forecast.forecastDays(); ++i) {
TQDate forecastDate = TQDate::currentDate().addDays(i);
- TQString columnName = KGlobal::locale()->formatDate(forecastDate, true);
+ TQString columnName = TDEGlobal::locale()->formatDate(forecastDate, true);
addColumn(columnName, -1);
}
diff --git a/kmymoney2/widgets/kmymoneybriefschedule.cpp b/kmymoney2/widgets/kmymoneybriefschedule.cpp
index 5fa5917..404d2a9 100644
--- a/kmymoney2/widgets/kmymoneybriefschedule.cpp
+++ b/kmymoney2/widgets/kmymoneybriefschedule.cpp
@@ -46,7 +46,7 @@
KMyMoneyBriefSchedule::KMyMoneyBriefSchedule(TQWidget *parent, const char *name )
: kScheduleBriefWidget(parent,name, WStyle_Customize | WStyle_NoBorder)
{
- KIconLoader *ic = KGlobal::iconLoader();
+ KIconLoader *ic = TDEGlobal::iconLoader();
m_nextButton->setPixmap(BarIcon(TQString::fromLatin1("1rightarrow")));
m_prevButton->setPixmap(BarIcon(TQString::fromLatin1("1leftarrow")));
@@ -107,13 +107,13 @@ void KMyMoneyBriefSchedule::loadSchedule()
{
int transactions = sched.paymentDates(m_date, sched.endDate()).count()-1;
text = i18n("Payment on %1 for %2 with %3 transactions remaining occuring %4.")
- .arg(KGlobal::locale()->formatDate(m_date, true))
+ .arg(TDEGlobal::locale()->formatDate(m_date, true))
.arg(amount.formatMoney(sched.account().fraction()))
.arg(TQString::number(transactions))
.arg(i18n(sched.occurenceToString()));
} else {
text = i18n("Payment on %1 for %2 occuring %4.")
- .arg(KGlobal::locale()->formatDate(m_date, true))
+ .arg(TDEGlobal::locale()->formatDate(m_date, true))
.arg(amount.formatMoney(sched.account().fraction()))
.arg(i18n(sched.occurenceToString()));
}
diff --git a/kmymoney2/widgets/kmymoneycalculator.cpp b/kmymoney2/widgets/kmymoneycalculator.cpp
index e3b72a4..ea6f035 100644
--- a/kmymoney2/widgets/kmymoneycalculator.cpp
+++ b/kmymoney2/widgets/kmymoneycalculator.cpp
@@ -41,7 +41,7 @@
kMyMoneyCalculator::kMyMoneyCalculator(TQWidget* parent, const char *name)
: TQFrame(parent, name)
{
- m_comma = KGlobal::locale()->monetaryDecimalSymbol()[0];
+ m_comma = TDEGlobal::locale()->monetaryDecimalSymbol()[0];
m_clearOperandOnDigit = false;
TQGridLayout* grid = new TQGridLayout(this, 5, 5, 1, 2);
@@ -322,7 +322,7 @@ const TQString kMyMoneyCalculator::result(void) const
if(txt[0] == '-') {
txt = txt.mid(1); // get rid of the minus sign
TQString mask;
- switch(KGlobal::locale()->negativeMonetarySignPosition()) {
+ switch(TDEGlobal::locale()->negativeMonetarySignPosition()) {
case KLocale::ParensAround:
mask = "(%1)";
break;
@@ -419,7 +419,7 @@ void kMyMoneyCalculator::setInitialValues(const TQString& value, TQKeyEvent* ev)
bool negative = false;
// setup operand
operand = value;
- operand.replace(TQRegExp(TQString("\\")+KGlobal::locale()->thousandsSeparator()), TQString());
+ operand.replace(TQRegExp(TQString("\\")+TDEGlobal::locale()->thousandsSeparator()), TQString());
operand.replace(TQRegExp(TQString("\\")+m_comma), ".");
if(operand.contains('(')) {
negative = true;
diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp
index 28ee506..35d4599 100644
--- a/kmymoney2/widgets/kmymoneycalendar.cpp
+++ b/kmymoney2/widgets/kmymoneycalendar.cpp
@@ -118,7 +118,7 @@ void kMyMoneyCalendar::init( const TQDate &dt )
d->selectWeek = new TQToolButton( this );
-// KIconLoader *kiconloader = KGlobal::iconLoader();
+// KIconLoader *kiconloader = TDEGlobal::iconLoader();
KPopupMenu* kpopupmenuNew = new KPopupMenu(this);
kpopupmenuNew->insertItem(i18n("Week"), this, TQT_SLOT(slotSetStyleWeekly()));
kpopupmenuNew->insertItem(i18n("Month"), this, TQT_SLOT(slotSetStyleMonthly()));
@@ -260,7 +260,7 @@ void
kMyMoneyCalendar::dateChangedSlot(TQDate date)
{
kdDebug() << "kMyMoneyCalendar::dateChangedSlot: date changed (" << date.year() << "/" << date.month() << "/" << date.day() << ")." << endl;
- line->setText(KGlobal::locale()->formatDate(date, true));
+ line->setText(TDEGlobal::locale()->formatDate(date, true));
d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date)));
selectMonth->setText(MONTH_NAME(date.month(), date.year(), false));
selectYear->setText(date.toString("yyyy"));
@@ -301,7 +301,7 @@ kMyMoneyCalendar::setDate(const TQDate& date)
selectMonth->setText(MONTH_NAME(date.month(), date.year(), false));
temp.setNum(date.year());
selectYear->setText(temp);
- line->setText(KGlobal::locale()->formatDate(date, true));
+ line->setText(TDEGlobal::locale()->formatDate(date, true));
return true;
} else {
kdDebug() << "kMyMoneyCalendar::setDate: refusing to set invalid date." << endl;
diff --git a/kmymoney2/widgets/kmymoneycalendar.h b/kmymoney2/widgets/kmymoneycalendar.h
index 30128e2..3fd6892 100644
--- a/kmymoney2/widgets/kmymoneycalendar.h
+++ b/kmymoney2/widgets/kmymoneycalendar.h
@@ -254,9 +254,9 @@ private:
int weekOfYear(TQDate);
#if KDE_IS_VERSION(3,2,0)
- #define MONTH_NAME(a,b,c) KGlobal::locale()->calendar()->monthName(a,b,c)
+ #define MONTH_NAME(a,b,c) TDEGlobal::locale()->calendar()->monthName(a,b,c)
#else
- #define MONTH_NAME(a,b,c) KGlobal::locale()->monthName(a,c)
+ #define MONTH_NAME(a,b,c) TDEGlobal::locale()->monthName(a,c)
#endif
};
diff --git a/kmymoney2/widgets/kmymoneycategory.cpp b/kmymoney2/widgets/kmymoneycategory.cpp
index 39f4b63..b4e2f83 100644
--- a/kmymoney2/widgets/kmymoneycategory.cpp
+++ b/kmymoney2/widgets/kmymoneycategory.cpp
@@ -68,7 +68,7 @@ KMyMoneyCategory::KMyMoneyCategory(TQWidget* parent, const char * name, bool spl
// create button
KGuiItem splitButtonItem("",
- TQIconSet(KGlobal::iconLoader()->loadIcon("split_transaction", KIcon::Small,
+ TQIconSet(TDEGlobal::iconLoader()->loadIcon("split_transaction", KIcon::Small,
KIcon::SizeSmall)), "", "");
d->splitButton = new KPushButton(splitButtonItem, d->frame, "splitButton");
diff --git a/kmymoney2/widgets/kmymoneydateinput.cpp b/kmymoney2/widgets/kmymoneydateinput.cpp
index 9ae13ec..bf64859 100644
--- a/kmymoney2/widgets/kmymoneydateinput.cpp
+++ b/kmymoney2/widgets/kmymoneydateinput.cpp
@@ -82,14 +82,14 @@ kMyMoneyDateInput::kMyMoneyDateInput(TQWidget *parent, const char *name, TQt::Al
m_datePopup = new KPassivePopup(dateEdit, "datePopup");
m_datePopup->setTimeout(DATE_POPUP_TIMEOUT);
- m_datePopup->setView(new TQLabel(KGlobal::locale()->formatDate(m_date), m_datePopup, "datePopupLabel"));
+ m_datePopup->setView(new TQLabel(TDEGlobal::locale()->formatDate(m_date), m_datePopup, "datePopupLabel"));
m_dateFrame = new TQVBox(this, 0, WType_Popup);
m_dateFrame->setFrameStyle(TQFrame::PopupPanel | TQFrame::Raised);
m_dateFrame->setLineWidth(3);
m_dateFrame->hide();
- TQString dateFormat = KGlobal::locale()->dateFormatShort().lower();
+ TQString dateFormat = TDEGlobal::locale()->dateFormatShort().lower();
TQString order, separator;
for(unsigned i = 0; i < dateFormat.length(); ++i) {
// DD.MM.YYYY is %d.%m.%y
@@ -132,7 +132,7 @@ kMyMoneyDateInput::kMyMoneyDateInput(TQWidget *parent, const char *name, TQt::Al
#endif
// the next line is a try to add an icon to the button
- m_dateButton = new KPushButton(TQIconSet(TQPixmap(KGlobal::iconLoader()->iconPath("date", -KIcon::SizeSmall))), TQString(""), this);
+ m_dateButton = new KPushButton(TQIconSet(TQPixmap(TDEGlobal::iconLoader()->iconPath("date", -KIcon::SizeSmall))), TQString(""), this);
m_dateButton->setMinimumWidth(30);
connect(m_dateButton,TQT_SIGNAL(clicked()),TQT_SLOT(toggleDatePicker()));
@@ -297,7 +297,7 @@ void kMyMoneyDateInput::slotDateChosenRef(const TQDate& date)
m_date = date;
TQLabel *lbl = static_cast<TQLabel*>(m_datePopup->view());
- lbl->setText(KGlobal::locale()->formatDate(date));
+ lbl->setText(TDEGlobal::locale()->formatDate(date));
lbl->adjustSize();
if(m_datePopup->isVisible() || hasFocus())
m_datePopup->show(); // Repaint
diff --git a/kmymoney2/widgets/kmymoneydatetbl.cpp b/kmymoney2/widgets/kmymoneydatetbl.cpp
index 2a51307..21aab16 100644
--- a/kmymoney2/widgets/kmymoneydatetbl.cpp
+++ b/kmymoney2/widgets/kmymoneydatetbl.cpp
@@ -85,7 +85,7 @@ kMyMoneyDateTbl::kMyMoneyDateTbl(TQWidget *parent, TQDate date_, const char* nam
setFocusPolicy( TQ_StrongFocus );
- viewport()->setEraseColor(KGlobalSettings::baseColor());
+ viewport()->setEraseColor(TDEGlobalSettings::baseColor());
setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth
@@ -102,17 +102,17 @@ kMyMoneyDateTbl::paintCell(TQPainter *painter, int row, int col)
TQPen pen;
int w=cellWidth();
int h=cellHeight();
- TQBrush brushBlue(KGlobalSettings::activeTitleColor());
- TQBrush brushLightblue(KGlobalSettings::baseColor());
- TQFont font=KGlobalSettings::generalFont();
+ TQBrush brushBlue(TDEGlobalSettings::activeTitleColor());
+ TQBrush brushLightblue(TDEGlobalSettings::baseColor());
+ TQFont font=TDEGlobalSettings::generalFont();
// -----
font.setPointSize(fontsize);
#if TDE_VERSION < 310
- int firstWeekDay = KGlobal::locale()->weekStartsMonday() ? 1 : 0;
+ int firstWeekDay = TDEGlobal::locale()->weekStartsMonday() ? 1 : 0;
#else
- int firstWeekDay = KGlobal::locale()->weekStartDay();
+ int firstWeekDay = TDEGlobal::locale()->weekStartDay();
#endif
if (row==0)
@@ -133,19 +133,19 @@ kMyMoneyDateTbl::paintCell(TQPainter *painter, int row, int col)
if (!normalday)
{
- painter->setPen(KGlobalSettings::baseColor());
+ painter->setPen(TDEGlobalSettings::baseColor());
painter->setBrush(brushLightblue);
painter->drawRect(0, 0, w, h);
- painter->setPen(KGlobalSettings::activeTitleColor());
+ painter->setPen(TDEGlobalSettings::activeTitleColor());
} else {
- painter->setPen(KGlobalSettings::activeTitleColor());
+ painter->setPen(TDEGlobalSettings::activeTitleColor());
painter->setBrush(brushBlue);
painter->drawRect(0, 0, w, h);
- painter->setPen(KGlobalSettings::activeTextColor());
+ painter->setPen(TDEGlobalSettings::activeTextColor());
}
painter->drawText(0, 0, w, h-1, AlignCenter,
daystr, -1, &rect);
- painter->setPen(KGlobalSettings::textColor());
+ painter->setPen(TDEGlobalSettings::textColor());
painter->moveTo(0, h-1);
painter->lineTo(w-1, h-1);
@@ -157,10 +157,10 @@ kMyMoneyDateTbl::paintCell(TQPainter *painter, int row, int col)
}
else if (m_type == WEEKLY)
{
- painter->setPen(KGlobalSettings::activeTitleColor());
+ painter->setPen(TDEGlobalSettings::activeTitleColor());
painter->setBrush(brushBlue);
painter->drawRect(0, 0, w, h);
- painter->setPen(KGlobalSettings::activeTextColor());
+ painter->setPen(TDEGlobalSettings::activeTextColor());
int year=date.year();
TQString headerText;
@@ -182,9 +182,9 @@ kMyMoneyDateTbl::paintCell(TQPainter *painter, int row, int col)
{
int athird = width()/3;
- painter->setPen(KGlobalSettings::activeTitleColor());
+ painter->setPen(TDEGlobalSettings::activeTitleColor());
painter->setBrush(brushBlue);
- painter->setPen(/*KGlobalSettings::activeTextColor()*/black);
+ painter->setPen(/*TDEGlobalSettings::activeTextColor()*/black);
if (col == 0)
{
@@ -379,9 +379,9 @@ kMyMoneyDateTbl::contentsMouseReleaseEvent(TQMouseEvent *e)
}
#if TDE_VERSION < 310
- int dayoff = KGlobal::locale()->weekStartsMonday() ? 1 : 0;
+ int dayoff = TDEGlobal::locale()->weekStartsMonday() ? 1 : 0;
#else
- int dayoff = KGlobal::locale()->weekStartDay();
+ int dayoff = TDEGlobal::locale()->weekStartDay();
#endif
// -----
@@ -572,9 +572,9 @@ void kMyMoneyDateTbl::contentsMouseMoveEvent(TQMouseEvent* e)
}
#if TDE_VERSION < 310
- int firstWeekDay = KGlobal::locale()->weekStartsMonday() ? 1 : 0;
+ int firstWeekDay = TDEGlobal::locale()->weekStartsMonday() ? 1 : 0;
#else
- int firstWeekDay = KGlobal::locale()->weekStartDay();
+ int firstWeekDay = TDEGlobal::locale()->weekStartDay();
#endif
TQDate drawDate(date);
diff --git a/kmymoney2/widgets/kmymoneydatetbl.h b/kmymoney2/widgets/kmymoneydatetbl.h
index 21da84d..7e26a09 100644
--- a/kmymoney2/widgets/kmymoneydatetbl.h
+++ b/kmymoney2/widgets/kmymoneydatetbl.h
@@ -178,9 +178,9 @@ protected:
private:
#if KDE_IS_VERSION(3,2,0)
- #define WEEK_DAY_NAME(a,b) KGlobal::locale()->calendar()->weekDayName(a,b)
+ #define WEEK_DAY_NAME(a,b) TDEGlobal::locale()->calendar()->weekDayName(a,b)
#else
- #define WEEK_DAY_NAME(a,b) KGlobal::locale()->weekDayName(a,b)
+ #define WEEK_DAY_NAME(a,b) TDEGlobal::locale()->weekDayName(a,b)
#endif
};
diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp
index c3ad220..b79ebfb 100644
--- a/kmymoney2/widgets/kmymoneyedit.cpp
+++ b/kmymoney2/widgets/kmymoneyedit.cpp
@@ -60,7 +60,7 @@ kMyMoneyMoneyValidator::kMyMoneyMoneyValidator( double bottom, double top, int d
TQValidator::State kMyMoneyMoneyValidator::validate( TQString & input, int & _p ) const
{
TQString s = input;
- KLocale * l = KGlobal::locale();
+ KLocale * l = TDEGlobal::locale();
// ok, we have to re-format the number to have:
// 1. decimalSymbol == '.'
// 2. negativeSign == '-'
@@ -159,7 +159,7 @@ kMyMoneyEdit::kMyMoneyEdit(TQWidget *parent, const char *name, const int prec)
{
m_prec = prec;
if(prec < -1 || prec > 20)
- m_prec = KGlobal::locale()->fracDigits();
+ m_prec = TDEGlobal::locale()->fracDigits();
init();
}
@@ -222,7 +222,7 @@ void kMyMoneyEdit::init(void)
m_calculatorFrame->setFixedSize(m_calculator->width()+3, m_calculator->height()+3);
m_calculatorFrame->hide();
- m_calcButton = new KPushButton(TQIconSet(TQPixmap(KGlobal::iconLoader()->iconPath("kcalc", -KIcon::SizeSmall))), TQString(""), this);
+ m_calcButton = new KPushButton(TQIconSet(TQPixmap(TDEGlobal::iconLoader()->iconPath("kcalc", -KIcon::SizeSmall))), TQString(""), this);
m_calcButton->setFixedWidth( m_calcButton->sizeHint().width() );
m_calcButton->setFixedHeight(m_edit->sizeHint().height());
m_calcButton->setFocusProxy(m_edit);
@@ -235,7 +235,7 @@ void kMyMoneyEdit::init(void)
m_resetButton->setEnabled(false);
m_resetButton->setFocusProxy(m_edit);
- KConfig *kconfig = KGlobal::config();
+ KConfig *kconfig = TDEGlobal::config();
kconfig->setGroup("General Options");
if(kconfig->readBoolEntry("DontShowCalculatorButton", false) == true)
setCalculatorButtonVisible(false);
@@ -319,7 +319,7 @@ void kMyMoneyEdit::resetText(void)
void kMyMoneyEdit::theTextChanged(const TQString & theText)
{
- KLocale * l = KGlobal::locale();
+ KLocale * l = TDEGlobal::locale();
TQString d = l->monetaryDecimalSymbol();
TQString l_text = theText;
TQString nsign, psign;
@@ -360,7 +360,7 @@ void kMyMoneyEdit::ensureFractionalPart(void)
void kMyMoneyEdit::ensureFractionalPart(TQString& s) const
{
- KLocale* locale = KGlobal::locale();
+ KLocale* locale = TDEGlobal::locale();
TQString decimalSymbol = locale->monetaryDecimalSymbol();
if(decimalSymbol.isEmpty())
decimalSymbol = ".";
diff --git a/kmymoney2/widgets/kmymoneygpgconfig.cpp b/kmymoney2/widgets/kmymoneygpgconfig.cpp
index 5ca6991..453ab7d 100644
--- a/kmymoney2/widgets/kmymoneygpgconfig.cpp
+++ b/kmymoney2/widgets/kmymoneygpgconfig.cpp
@@ -63,7 +63,7 @@ void kMyMoneyGPGConfig::resetConfig(void)
void kMyMoneyGPGConfig::readConfig(void)
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("General Options");
m_resetUseEncryption = config->readBoolEntry("WriteDataEncrypted", false);
m_resetRecover = config->readBoolEntry("EncryptRecover", false);
@@ -74,7 +74,7 @@ void kMyMoneyGPGConfig::readConfig(void)
void kMyMoneyGPGConfig::writeConfig(void)
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("General Options");
config->writeEntry("WriteDataEncrypted", m_useEncryption->isChecked());
config->writeEntry("EncryptRecover", m_recover->isChecked());
diff --git a/kmymoney2/widgets/kmymoneylineedit.cpp b/kmymoney2/widgets/kmymoneylineedit.cpp
index c99ad02..b7c96ab 100644
--- a/kmymoney2/widgets/kmymoneylineedit.cpp
+++ b/kmymoney2/widgets/kmymoneylineedit.cpp
@@ -78,14 +78,14 @@ void kMyMoneyLineEdit::keyReleaseEvent(TQKeyEvent* k)
if(k->state() & TQt::Keypad) {
if(k->key() == TQt::Key_Comma
|| k->key() == TQt::Key_Period) {
- if(KGlobal::locale()->monetaryDecimalSymbol() == ",") {
+ if(TDEGlobal::locale()->monetaryDecimalSymbol() == ",") {
TQKeyEvent newk(k->type(), TQt::Key_Comma, ',', k->state(), ",", k->isAutoRepeat(), k->count());
KLineEdit::keyReleaseEvent(&newk);
k->ignore();
return;
}
- if(KGlobal::locale()->monetaryDecimalSymbol() == ".") {
+ if(TDEGlobal::locale()->monetaryDecimalSymbol() == ".") {
TQKeyEvent newk(k->type(), TQt::Key_Comma, ',', k->state(), ".", k->isAutoRepeat(), k->count());
KLineEdit::keyReleaseEvent(&newk);
k->ignore();
@@ -103,14 +103,14 @@ void kMyMoneyLineEdit::keyPressEvent(TQKeyEvent* k)
if(k->state() & TQt::Keypad) {
if(k->key() == TQt::Key_Comma
|| k->key() == TQt::Key_Period) {
- if(KGlobal::locale()->monetaryDecimalSymbol() == ",") {
+ if(TDEGlobal::locale()->monetaryDecimalSymbol() == ",") {
TQKeyEvent newk(k->type(), TQt::Key_Comma, ',', k->state(), ",", k->isAutoRepeat(), k->count());
KLineEdit::keyPressEvent(&newk);
k->ignore();
return;
}
- if(KGlobal::locale()->monetaryDecimalSymbol() == ".") {
+ if(TDEGlobal::locale()->monetaryDecimalSymbol() == ".") {
TQKeyEvent newk(k->type(), TQt::Key_Period, '.', k->state(), ".", k->isAutoRepeat(), k->count());
KLineEdit::keyPressEvent(&newk);
k->ignore();
diff --git a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp
index e41d4b8..738749f 100644
--- a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp
+++ b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp
@@ -48,7 +48,7 @@ kMyMoneyOnlineQuoteConfig::kMyMoneyOnlineQuoteConfig(TQWidget *parent, const cha
m_updateButton->setEnabled(false);
- KIconLoader* il = KGlobal::iconLoader();
+ KIconLoader* il = TDEGlobal::iconLoader();
KGuiItem updateButtenItem( i18n("&Update" ),
TQIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)),
i18n("Accepts the entered data and stores it"),
diff --git a/kmymoney2/widgets/kmymoneypriceview.cpp b/kmymoney2/widgets/kmymoneypriceview.cpp
index 851ca02..bc4285b 100644
--- a/kmymoney2/widgets/kmymoneypriceview.cpp
+++ b/kmymoney2/widgets/kmymoneypriceview.cpp
@@ -66,7 +66,7 @@ KMyMoneyPriceItem::KMyMoneyPriceItem(KListView *view, const MyMoneyPrice& pr) :
m_pr(pr)
{
MyMoneySecurity from, to;
- KConfig *kconfig = KGlobal::config();
+ KConfig *kconfig = TDEGlobal::config();
kconfig->setGroup("General Options");
int prec = kconfig->readNumEntry("PricePrecision", 4);
@@ -85,7 +85,7 @@ KMyMoneyPriceItem::KMyMoneyPriceItem(KListView *view, const MyMoneyPrice& pr) :
setText(COMMODITY_COL, (from.isCurrency()) ? from.id() : from.tradingSymbol());
setText(CURRENCY_COL, to.id());
- setText(DATE_COL, KGlobal::locale()->formatDate(m_pr.date(), true));
+ setText(DATE_COL, TDEGlobal::locale()->formatDate(m_pr.date(), true));
setText(PRICE_COL, m_pr.rate(priceBase).formatMoney("", prec));
setText(SOURCE_COL, m_pr.source());
}
@@ -137,7 +137,7 @@ KMyMoneyPriceView::KMyMoneyPriceView(TQWidget *parent, const char *name ) :
header()->setFont(KMyMoneyGlobalSettings::listHeaderFont());
- KIconLoader *kiconloader = KGlobal::iconLoader();
+ KIconLoader *kiconloader = TDEGlobal::iconLoader();
m_contextMenu = new KPopupMenu(this);
m_contextMenu->insertTitle(i18n("Price Options"));
diff --git a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp
index ad96947..964b0f6 100644
--- a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp
+++ b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp
@@ -81,9 +81,9 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/,
int w=cellWidth();
int h=cellHeight();
TQPen pen;
- TQBrush brushBlue(KGlobalSettings::activeTitleColor());
- TQBrush brushLightblue(KGlobalSettings::baseColor());
- TQFont font=KGlobalSettings::generalFont();
+ TQBrush brushBlue(TDEGlobalSettings::activeTitleColor());
+ TQBrush brushLightblue(TDEGlobalSettings::baseColor());
+ TQFont font=TDEGlobalSettings::generalFont();
MyMoneyFile *file = MyMoneyFile::instance();
// -----
@@ -112,17 +112,17 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/,
{
if (hasFocus())
{ // draw the currently selected date
- painter->setPen(KGlobalSettings::highlightColor());
- painter->setBrush(KGlobalSettings::highlightColor());
+ painter->setPen(TDEGlobalSettings::highlightColor());
+ painter->setBrush(TDEGlobalSettings::highlightColor());
pen=TQPen(white);
} else {
- painter->setPen(KGlobalSettings::calculateAlternateBackgroundColor(KGlobalSettings::highlightColor()));
- painter->setBrush(KGlobalSettings::calculateAlternateBackgroundColor(KGlobalSettings::highlightColor()));
+ painter->setPen(TDEGlobalSettings::calculateAlternateBackgroundColor(TDEGlobalSettings::highlightColor()));
+ painter->setBrush(TDEGlobalSettings::calculateAlternateBackgroundColor(TDEGlobalSettings::highlightColor()));
pen=TQPen(white);
}
} else {
- painter->setBrush(KGlobalSettings::baseColor());
- painter->setPen(KGlobalSettings::baseColor());
+ painter->setBrush(TDEGlobalSettings::baseColor());
+ painter->setPen(TDEGlobalSettings::baseColor());
}
painter->drawRect(0, 0, w, h);
painter->setPen(pen);
@@ -205,12 +205,12 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/,
// TODO: Handle other start weekdays than Monday
if (theDate == date)
{
- painter->setBrush(KGlobalSettings::highlightColor());
+ painter->setBrush(TDEGlobalSettings::highlightColor());
}
else
{
- painter->setBrush(KGlobalSettings::baseColor());
- painter->setPen(KGlobalSettings::baseColor());
+ painter->setBrush(TDEGlobalSettings::baseColor());
+ painter->setPen(TDEGlobalSettings::baseColor());
}
painter->setPen(lightGray);
@@ -339,7 +339,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/,
}
else if (m_type == QUARTERLY)
{
- painter->setBrush(KGlobalSettings::baseColor());
+ painter->setBrush(TDEGlobalSettings::baseColor());
painter->setPen(lightGray);
painter->drawRect(0, 0, w, h);
@@ -378,9 +378,9 @@ void kMyMoneyScheduledDateTbl::contentsMouseMoveEvent(TQMouseEvent* e)
}
#if TDE_VERSION < 310
- int firstWeekDay = KGlobal::locale()->weekStartsMonday() ? 1 : 0;
+ int firstWeekDay = TDEGlobal::locale()->weekStartsMonday() ? 1 : 0;
#else
- int firstWeekDay = KGlobal::locale()->weekStartDay();
+ int firstWeekDay = TDEGlobal::locale()->weekStartDay();
#endif
TQDate drawDate(date);
diff --git a/kmymoney2/widgets/kmymoneytitlelabel.cpp b/kmymoney2/widgets/kmymoneytitlelabel.cpp
index f852c76..b73f458 100644
--- a/kmymoney2/widgets/kmymoneytitlelabel.cpp
+++ b/kmymoney2/widgets/kmymoneytitlelabel.cpp
@@ -38,10 +38,10 @@
KMyMoneyTitleLabel::KMyMoneyTitleLabel(TQWidget *parent, const char *name) :
TQLabel(parent, name),
- m_bgColor( KGlobalSettings::highlightColor() ),
- m_textColor( KGlobalSettings::highlightedTextColor() )
+ m_bgColor( TDEGlobalSettings::highlightColor() ),
+ m_textColor( TDEGlobalSettings::highlightedTextColor() )
{
- setFont(KGlobalSettings::windowTitleFont());
+ setFont(TDEGlobalSettings::windowTitleFont());
}
KMyMoneyTitleLabel::~KMyMoneyTitleLabel()
@@ -51,7 +51,7 @@ KMyMoneyTitleLabel::~KMyMoneyTitleLabel()
void KMyMoneyTitleLabel::setLeftImageFile(const TQString& _file)
{
m_leftImageFile = _file;
- TQString lfullpath = KGlobal::dirs()->findResource("appdata", m_leftImageFile);
+ TQString lfullpath = TDEGlobal::dirs()->findResource("appdata", m_leftImageFile);
m_leftImage.load(lfullpath);
m_leftImage.setAlphaBuffer(true);
}
@@ -59,7 +59,7 @@ void KMyMoneyTitleLabel::setLeftImageFile(const TQString& _file)
void KMyMoneyTitleLabel::setRightImageFile(const TQString& _file)
{
m_rightImageFile = _file;
- TQString rfullpath = KGlobal::dirs()->findResource("appdata", m_rightImageFile);
+ TQString rfullpath = TDEGlobal::dirs()->findResource("appdata", m_rightImageFile);
m_rightImage.load(rfullpath);
m_rightImage.setAlphaBuffer(true);
if(m_rightImage.height() < 30)
diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp
index f446acf..8c3960c 100644
--- a/kmymoney2/widgets/kmymoneywizard.cpp
+++ b/kmymoney2/widgets/kmymoneywizard.cpp
@@ -123,7 +123,7 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W
m_finishButton = new KPushButton(i18n("&Finish"), this);
m_helpButton = new KPushButton(i18n("&Help"), this);
- if ( KGlobalSettings::showIconsOnPushButtons() )
+ if ( TDEGlobalSettings::showIconsOnPushButtons() )
{
m_backButton->setIconSet( KStdGuiItem::back( KStdGuiItem::UseRTL ).iconSet() );
m_nextButton->setIconSet( KStdGuiItem::forward( KStdGuiItem::UseRTL ).iconSet() );
@@ -150,7 +150,7 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W
// create stage layout and frame
m_stepFrame = new TQFrame(this, "stepFrame");
- m_stepFrame->setPaletteBackgroundColor(KGlobalSettings::highlightColor());
+ m_stepFrame->setPaletteBackgroundColor(TDEGlobalSettings::highlightColor());
m_stepLayout = new TQVBoxLayout(m_stepFrame, 11, 6, "stepLayout");
m_stepLayout->addWidget(new TQLabel("", m_stepFrame));
m_stepLayout->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
@@ -163,7 +163,7 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W
// information when the user selected a different color set using the KConfigCenter
m_stepPalette = m_stepLabel->palette();
TQColorGroup::ColorRole role = TQColorGroup::Foreground;
- TQColor color = KGlobalSettings::highlightedTextColor();
+ TQColor color = TDEGlobalSettings::highlightedTextColor();
m_stepPalette.setColor( TQPalette::Active, role, color );
m_stepPalette.setColor( TQPalette::Inactive, role, color );
m_stepPalette.setColor( TQPalette::Disabled, role, color );
diff --git a/kmymoney2/widgets/register.cpp b/kmymoney2/widgets/register.cpp
index 5a0148c..e07cd42 100644
--- a/kmymoney2/widgets/register.cpp
+++ b/kmymoney2/widgets/register.cpp
@@ -340,7 +340,7 @@ void GroupMarker::paintRegisterCell(TQPainter* painter, int row, int /* col */,
font.setBold(false);
painter->setFont(font);
- painter->drawText(cellRect, TQt::AlignVCenter | TQt::AlignCenter, KGlobal::locale()->formatDate(sortPostDate(), true));
+ painter->drawText(cellRect, TQt::AlignVCenter | TQt::AlignCenter, TDEGlobal::locale()->formatDate(sortPostDate(), true));
}
painter->restore();
@@ -1374,7 +1374,7 @@ void Register::adjustColumn(int col)
// check for date column
if(col == DateColumn) {
- TQString txt = KGlobal::locale()->formatDate(TQDate(6999,12,29), true);
+ TQString txt = TDEGlobal::locale()->formatDate(TQDate(6999,12,29), true);
int nw = cellFontMetrics.width(txt+" ");
w = TQMAX( w, nw );
} else {
@@ -2271,7 +2271,7 @@ void Register::addGroupMarkers(void)
yesterday = today.addDays(-1);
// a = TQDate::dayOfWeek() todays weekday (1 = Monday, 7 = Sunday)
// b = KLocale::weekStartDay() first day of week (1 = Monday, 7 = Sunday)
- weekStartOfs = today.dayOfWeek() - KGlobal::locale()->weekStartDay();
+ weekStartOfs = today.dayOfWeek() - TDEGlobal::locale()->weekStartDay();
if(weekStartOfs < 0) {
weekStartOfs = 7 + weekStartOfs;
}
diff --git a/kmymoney2/widgets/transaction.cpp b/kmymoney2/widgets/transaction.cpp
index 00d0f56..ea5ea2c 100644
--- a/kmymoney2/widgets/transaction.cpp
+++ b/kmymoney2/widgets/transaction.cpp
@@ -212,7 +212,7 @@ void Transaction::markAttachment(TQPainter* painter, int /* row */, int /* col *
painter->save();
if(clip.isNull()) {
- clip = KGlobal::iconLoader()->loadIcon("attach", KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState);
+ clip = TDEGlobal::iconLoader()->loadIcon("attach", KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState);
if(clip.height() > h) {
clip.resize(h, h);
}
@@ -1029,7 +1029,7 @@ bool StdTransaction::formCellText(TQString& txt, int& align, int row, int col, T
case ValueColumn2:
align |= TQt::AlignRight;
if(m_transaction != MyMoneyTransaction())
- txt = KGlobal::locale()->formatDate(m_transaction.postDate(), true);
+ txt = TDEGlobal::locale()->formatDate(m_transaction.postDate(), true);
break;
}
break;
@@ -1096,7 +1096,7 @@ void StdTransaction::registerCellText(TQString& txt, int& align, int row, int co
case DateColumn:
align |= TQt::AlignLeft;
- txt = KGlobal::locale()->formatDate(m_transaction.postDate(), true);
+ txt = TDEGlobal::locale()->formatDate(m_transaction.postDate(), true);
break;
case DetailColumn:
@@ -1500,7 +1500,7 @@ bool InvestTransaction::formCellText(TQString& txt, int& align, int row, int col
align |= TQt::AlignRight;
fieldEditable = true;
if(m_transaction != MyMoneyTransaction())
- txt = KGlobal::locale()->formatDate(m_transaction.postDate(), true);
+ txt = TDEGlobal::locale()->formatDate(m_transaction.postDate(), true);
break;
}
break;
@@ -1688,7 +1688,7 @@ void InvestTransaction::registerCellText(TQString& txt, int& align, int row, int
switch(col) {
case DateColumn:
align |= TQt::AlignLeft;
- txt = KGlobal::locale()->formatDate(m_transaction.postDate(), true);
+ txt = TDEGlobal::locale()->formatDate(m_transaction.postDate(), true);
break;
case DetailColumn:
diff --git a/kmymoney2/widgets/transactionsortoption.ui.h b/kmymoney2/widgets/transactionsortoption.ui.h
index 636a6a7..cf87646 100644
--- a/kmymoney2/widgets/transactionsortoption.ui.h
+++ b/kmymoney2/widgets/transactionsortoption.ui.h
@@ -26,7 +26,7 @@
void TransactionSortOption::init()
{
- KIconLoader* il = KGlobal::iconLoader();
+ KIconLoader* il = TDEGlobal::iconLoader();
m_addButton->setIconSet(TQIconSet(il->loadIcon("1rightarrow", KIcon::Small, KIcon::SizeSmall)));
m_removeButton->setIconSet(TQIconSet(il->loadIcon("1leftarrow", KIcon::Small, KIcon::SizeSmall)));
m_upButton->setIconSet(TQIconSet(il->loadIcon("1uparrow", KIcon::Small, KIcon::SizeSmall)));