summaryrefslogtreecommitdiffstats
path: root/libtdeedu/extdate
diff options
context:
space:
mode:
Diffstat (limited to 'libtdeedu/extdate')
-rw-r--r--libtdeedu/extdate/extcalendarsystem.cpp2
-rw-r--r--libtdeedu/extdate/extdatepicker.cpp26
-rw-r--r--libtdeedu/extdate/extdatetbl.cpp44
-rw-r--r--libtdeedu/extdate/extdatetime.cpp6
-rw-r--r--libtdeedu/extdate/extdatewidget.cpp8
5 files changed, 43 insertions, 43 deletions
diff --git a/libtdeedu/extdate/extcalendarsystem.cpp b/libtdeedu/extdate/extcalendarsystem.cpp
index 58960986..38465749 100644
--- a/libtdeedu/extdate/extcalendarsystem.cpp
+++ b/libtdeedu/extdate/extcalendarsystem.cpp
@@ -54,7 +54,7 @@ const KLocale * ExtCalendarSystem::locale() const
if ( d->locale )
return d->locale;
- return KGlobal::locale();
+ return TDEGlobal::locale();
}
TQString ExtCalendarSystem::dayString(const ExtDate & pDate, bool bShort) const
diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp
index 7d167a98..e9f2f4fe 100644
--- a/libtdeedu/extdate/extdatepicker.cpp
+++ b/libtdeedu/extdate/extdatepicker.cpp
@@ -60,7 +60,7 @@ void ExtDatePicker::fillWeeksCombo(const ExtDate &date)
// every year can have a different number of weeks
//must remain commented unless ExtDate stuff gets added to tdelibs
-// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar();
+// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar();
// it could be that we had 53,1..52 and now 1..53 which is the same number but different
// so always fill with new values
@@ -139,9 +139,9 @@ void ExtDatePicker::init( const ExtDate &dt )
line = new KLineEdit(this);
val = new ExtDateValidator(this);
table = new ExtDateTable(this);
- fontsize = KGlobalSettings::generalFont().pointSize();
+ fontsize = TDEGlobalSettings::generalFont().pointSize();
if (fontsize == -1)
- fontsize = TQFontInfo(KGlobalSettings::generalFont()).pointSize();
+ fontsize = TQFontInfo(TDEGlobalSettings::generalFont()).pointSize();
fontsize++; // Make a little bigger
@@ -240,10 +240,10 @@ ExtDatePicker::dateChangedSlot(const ExtDate &date)
//must remain commented unless ExtDate gets added to tdelibs
-// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar();
+// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar();
-// line->setText(KGlobal::locale()->formatDate(date, true));
- line->setText( date.toString( KGlobal::locale()->dateFormatShort() ) );
+// line->setText(TDEGlobal::locale()->formatDate(date, true));
+ line->setText( date.toString( TDEGlobal::locale()->dateFormatShort() ) );
selectMonth->setText(d->calendar->monthName(date, false));
fillWeeksCombo(date);
@@ -295,7 +295,7 @@ void
ExtDatePicker::monthForwardClicked()
{
ExtDate temp;
-// temp = KGlobal::locale()->calendar()->addMonths( table->getDate(), 1 );
+// temp = TDEGlobal::locale()->calendar()->addMonths( table->getDate(), 1 );
temp = d->calendar->addMonths( table->getDate(), 1 );
setDate( temp );
}
@@ -304,7 +304,7 @@ void
ExtDatePicker::monthBackwardClicked()
{
ExtDate temp;
-// temp = KGlobal::locale()->calendar()->addMonths( table->getDate(), -1 );
+// temp = TDEGlobal::locale()->calendar()->addMonths( table->getDate(), -1 );
temp = d->calendar->addMonths( table->getDate(), -1 );
setDate( temp );
}
@@ -313,7 +313,7 @@ void
ExtDatePicker::yearForwardClicked()
{
ExtDate temp;
-// temp = KGlobal::locale()->calendar()->addYears( table->getDate(), 1 );
+// temp = TDEGlobal::locale()->calendar()->addYears( table->getDate(), 1 );
temp = d->calendar->addYears( table->getDate(), 1 );
setDate( temp );
}
@@ -322,7 +322,7 @@ void
ExtDatePicker::yearBackwardClicked()
{
ExtDate temp;
-// temp = KGlobal::locale()->calendar()->addYears( table->getDate(), -1 );
+// temp = TDEGlobal::locale()->calendar()->addYears( table->getDate(), -1 );
temp = d->calendar->addYears( table->getDate(), -1 );
setDate( temp );
}
@@ -332,7 +332,7 @@ void ExtDatePicker::selectWeekClicked() {} // ### in 3.2 obsolete; kept for bin
void
ExtDatePicker::weekSelected(int week)
{
-// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar();
+// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar();
ExtDate date = table->getDate();
int year = d->calendar->year(date);
@@ -349,7 +349,7 @@ void
ExtDatePicker::selectMonthClicked()
{
// every year can have different month names (in some calendar systems)
-// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar();
+// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar();
ExtDate date = table->getDate();
int i, month, months = d->calendar->monthsInYear(date);
@@ -375,7 +375,7 @@ ExtDatePicker::selectMonthClicked()
void
ExtDatePicker::selectYearClicked()
{
-// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar();
+// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar();
if (selectYear->state() == TQButton::Off)
{
diff --git a/libtdeedu/extdate/extdatetbl.cpp b/libtdeedu/extdate/extdatetbl.cpp
index 78c7c9a8..295f1442 100644
--- a/libtdeedu/extdate/extdatetbl.cpp
+++ b/libtdeedu/extdate/extdatetbl.cpp
@@ -99,7 +99,7 @@ TQValidator::State
ExtDateValidator::date(const TQString& text, ExtDate& ed) const
{
//FIXME: Can't uncomment unless ExtDate is adopted by KDE
- //ExtDate tmp = KGlobal::locale()->readDate(text);
+ //ExtDate tmp = TDEGlobal::locale()->readDate(text);
ExtDate tmp = ExtDate::fromString( text );
if (!tmp.isNull())
@@ -131,7 +131,7 @@ ExtDateTable::ExtDateTable(TQWidget *parent, ExtDate date_, const char* name, WF
setNumCols(7); // 7 days a week
setHScrollBarMode(AlwaysOff);
setVScrollBarMode(AlwaysOff);
- viewport()->setEraseColor(KGlobalSettings::baseColor());
+ viewport()->setEraseColor(TDEGlobalSettings::baseColor());
setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth
}
@@ -143,8 +143,8 @@ ExtDateTable::~ExtDateTable()
int ExtDateTable::posFromDate( const ExtDate &dt )
{
//FIXME: Can't uncomment unless ExtDate is added to tdelibs
-// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar();
-// const int firstWeekDay = KGlobal::locale()->weekStartDay();
+// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar();
+// const int firstWeekDay = TDEGlobal::locale()->weekStartDay();
const int firstWeekDay = 7;
@@ -161,8 +161,8 @@ ExtDate ExtDateTable::dateFromPos( int pos )
ExtDate pCellDate;
//FIXME: Can't uncomment unless ExtDate is added to tdelibs
-// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar();
-// int firstWeekDay = KGlobal::locale()->weekStartDay();
+// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar();
+// int firstWeekDay = TDEGlobal::locale()->weekStartDay();
const int firstWeekDay = 7;
d->calendar->setYMD(pCellDate, d->calendar->year(date), d->calendar->month(date), 1);
@@ -180,8 +180,8 @@ void
ExtDateTable::paintCell(TQPainter *painter, int row, int col)
{
//FIXME: Can't uncomment unless ExtDate is added to tdelibs
-// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar();
-// int firstWeekDay = KGlobal::locale()->weekStartDay();
+// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar();
+// int firstWeekDay = TDEGlobal::locale()->weekStartDay();
const int firstWeekDay = 7;
TQRect rect;
@@ -189,7 +189,7 @@ ExtDateTable::paintCell(TQPainter *painter, int row, int col)
TQPen pen;
int w=cellWidth();
int h=cellHeight();
- TQFont font=KGlobalSettings::generalFont();
+ TQFont font=TDEGlobalSettings::generalFont();
// -----
if(row==0)
@@ -205,8 +205,8 @@ ExtDateTable::paintCell(TQPainter *painter, int row, int col)
TQBrush brushTitle();
TQBrush brushInvertTitle(colorGroup().base());
- TQColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( KGlobalSettings::inactiveTitleColor() ) );
- TQColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) );
+ TQColor titleColor(isEnabled()?( TDEGlobalSettings::activeTitleColor() ):( TDEGlobalSettings::inactiveTitleColor() ) );
+ TQColor textColor(isEnabled()?( TDEGlobalSettings::activeTextColor() ):( TDEGlobalSettings::inactiveTextColor() ) );
if (!normalday)
{
painter->setPen(textColor);
@@ -303,7 +303,7 @@ void
ExtDateTable::keyPressEvent( TQKeyEvent *e )
{
//FIXME: Can't uncomment unless ExtDate is added to tdelibs
-// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar();
+// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar();
ExtDate temp = date;
@@ -373,7 +373,7 @@ void
ExtDateTable::setFontSize(int size)
{
//FIXME: Can't uncomment unless ExtDate is added to tdelibs
-// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar();
+// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar();
int count;
TQFontMetrics metrics(fontMetrics());
@@ -454,7 +454,7 @@ ExtDateTable::contentsMousePressEvent(TQMouseEvent *e)
//FIXME: Uncomment the following line (and remove the one after it)
// if ExtDate is added to tdelibs
-// menu->insertTitle( KGlobal::locale()->formatDate(clickedDate) );
+// menu->insertTitle( TDEGlobal::locale()->formatDate(clickedDate) );
menu->insertTitle( clickedDate.toString() );
emit aboutToShowContextMenu( menu, clickedDate );
@@ -482,7 +482,7 @@ ExtDateTable::setDate(const ExtDate& date_)
}
//FIXME: Can't uncomment the following unless ExtDate is moved to tdelibs
-// const ExtCalendarSystem * calendar = KGlobal::locale()->calendar();
+// const ExtCalendarSystem * calendar = TDEGlobal::locale()->calendar();
d->calendar->setYMD(temp, d->calendar->year(date), d->calendar->month(date), 1);
//temp.setYMD(date.year(), date.month(), 1);
@@ -572,7 +572,7 @@ ExtDateInternalWeekSelector::ExtDateInternalWeekSelector
{
TQFont font;
// -----
- font=KGlobalSettings::generalFont();
+ font=TDEGlobalSettings::generalFont();
setFont(font);
setFrameStyle(TQFrame::NoFrame);
setValidator(val);
@@ -643,14 +643,14 @@ ExtDateInternalMonthPicker::ExtDateInternalMonthPicker
result(0) // invalid
{
//FIXME: Can't uncomment the following unless ExtDate is moved to tdelibs
-// ExtCalendarSystem *calendar = KGlobal::locale()->calendar();
+// ExtCalendarSystem *calendar = TDEGlobal::locale()->calendar();
TQRect rect;
TQFont font;
// -----
activeCol = -1;
activeRow = -1;
- font=KGlobalSettings::generalFont();
+ font=TDEGlobalSettings::generalFont();
setFont(font);
setHScrollBarMode(AlwaysOff);
setVScrollBarMode(AlwaysOff);
@@ -661,7 +661,7 @@ ExtDateInternalMonthPicker::ExtDateInternalMonthPicker
setNumRows( (d->calendar->monthsInYear(date) + 2) / 3);
// enable to find drawing failures:
// setTableFlags(Tbl_clipCellPainting);
- viewport()->setEraseColor(KGlobalSettings::baseColor()); // for consistency with the datepicker
+ viewport()->setEraseColor(TDEGlobalSettings::baseColor()); // for consistency with the datepicker
// ----- find the preferred size
// (this is slow, possibly, but unfortunately it is needed here):
TQFontMetrics metrics(font);
@@ -692,7 +692,7 @@ ExtDateInternalMonthPicker::getResult() const
void
ExtDateInternalMonthPicker::setupPainter(TQPainter *p)
{
- p->setPen(KGlobalSettings::textColor());
+ p->setPen(TDEGlobalSettings::textColor());
}
void
@@ -819,7 +819,7 @@ ExtDateInternalYearSelector::ExtDateInternalYearSelector
{
TQFont font;
// -----
- font=KGlobalSettings::generalFont();
+ font=TDEGlobalSettings::generalFont();
setFont(font);
setFrameStyle(TQFrame::NoFrame);
// set year limits (perhaps we should get rid of limits altogether)
@@ -923,7 +923,7 @@ void
KPopupFrame::popup(const TQPoint &pos)
{
// Make sure the whole popup is visible.
- TQRect d = KGlobalSettings::desktopGeometry(pos);
+ TQRect d = TDEGlobalSettings::desktopGeometry(pos);
int x = pos.x();
int y = pos.y();
diff --git a/libtdeedu/extdate/extdatetime.cpp b/libtdeedu/extdate/extdatetime.cpp
index 681db123..3efcfdbd 100644
--- a/libtdeedu/extdate/extdatetime.cpp
+++ b/libtdeedu/extdate/extdatetime.cpp
@@ -258,7 +258,7 @@ TQString ExtDate::toString( Qt::DateFormat f) const
break;
case Qt::LocalDate : // local settings
- a_format = KGlobal::locale()->dateFormat();
+ a_format = TDEGlobal::locale()->dateFormat();
break;
default :
@@ -803,8 +803,8 @@ TQString ExtDateTime::toString( Qt::DateFormat f ) const
}
#endif
else if ( f == Qt::LocalDate ) {
- return toString( KGlobal::locale()->dateFormat()
- + " " + KGlobal::locale()->timeFormat() );
+ return toString( TDEGlobal::locale()->dateFormat()
+ + " " + TDEGlobal::locale()->timeFormat() );
}
return TQString();
diff --git a/libtdeedu/extdate/extdatewidget.cpp b/libtdeedu/extdate/extdatewidget.cpp
index bd0163d3..014c8568 100644
--- a/libtdeedu/extdate/extdatewidget.cpp
+++ b/libtdeedu/extdate/extdatewidget.cpp
@@ -73,7 +73,7 @@ ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *parent,
// void ExtDateWidget::init()
// {
// d = new ExtDateWidgetPrivate;
-// KLocale *locale = KGlobal::locale();
+// KLocale *locale = TDEGlobal::locale();
// TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
// layout->setAutoAdd(true);
// d->m_day = new ExtDateWidgetSpinBox(1, 1, this);
@@ -97,7 +97,7 @@ ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *parent,
void ExtDateWidget::init(const ExtDate& date)
{
d = new ExtDateWidgetPrivate;
- //KLocale *locale = KGlobal::locale();
+ //KLocale *locale = TDEGlobal::locale();
TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
layout->setAutoAdd(true);
d->m_day = new ExtDateWidgetSpinBox(1, 1, this);
@@ -125,7 +125,7 @@ ExtDateWidget::~ExtDateWidget()
void ExtDateWidget::setDate( const ExtDate &date )
{
-// const KCalendarSystem * calendar = KGlobal::locale()->calendar();
+// const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
d->m_day->blockSignals(true);
d->m_month->blockSignals(true);
@@ -151,7 +151,7 @@ ExtDate ExtDateWidget::date() const
void ExtDateWidget::slotDateChanged( )
{
-// const KCalendarSystem * calendar = KGlobal::locale()->calendar();
+// const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
ExtDate date;
int y,m,day;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-03 07:19:29 +0000