diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
| commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
| tree | d087071b1e8fcf79698938efec19f8e48bab0799 /kalarm/recurrenceedit.cpp | |
| parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
| download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kalarm/recurrenceedit.cpp')
| -rw-r--r-- | kalarm/recurrenceedit.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp index 216c1f47..cfda8fc2 100644 --- a/kalarm/recurrenceedit.cpp +++ b/kalarm/recurrenceedit.cpp @@ -563,7 +563,7 @@ void RecurrenceEdit::addException() if (insert) { mExceptionDates.insert(it, date); - mExceptionDateList->insertItem(KGlobal::locale()->formatDate(date), index); + mExceptionDateList->insertItem(TDEGlobal::locale()->formatDate(date), index); } mExceptionDateList->setCurrentItem(index); enableExceptionButtons(); @@ -856,7 +856,7 @@ void RecurrenceEdit::set(const KAEvent& event, bool keepDuration) qHeapSort(mExceptionDates); mExceptionDateList->clear(); for (DateList::ConstIterator it = mExceptionDates.begin(); it != mExceptionDates.end(); ++it) - mExceptionDateList->insertItem(KGlobal::locale()->formatDate(*it)); + mExceptionDateList->insertItem(TDEGlobal::locale()->formatDate(*it)); enableExceptionButtons(); // Get repetition within recurrence @@ -1124,7 +1124,7 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis // Save the first day of the week, just in case it changes while the dialog is open. TQWidget* box = new TQWidget(this); // this is to control the TQWhatsThis text display area TQGridLayout* dgrid = new TQGridLayout(box, 4, 2, 0, KDialog::spacingHint()); - const KCalendarSystem* calendar = KGlobal::locale()->calendar(); + const KCalendarSystem* calendar = TDEGlobal::locale()->calendar(); for (int i = 0; i < 7; ++i) { int day = KAlarm::localeDayInWeek_to_weekDay(i); @@ -1314,7 +1314,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats mPosButton->setFocusWidget(mWeekCombo); mDayOfWeekCombo = new ComboBox(false, box); - const KCalendarSystem* calendar = KGlobal::locale()->calendar(); + const KCalendarSystem* calendar = TDEGlobal::locale()->calendar(); for (int i = 0; i < 7; ++i) { int day = KAlarm::localeDayInWeek_to_weekDay(i); @@ -1465,7 +1465,7 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name) TQWidget* w = new TQWidget(this); // this is to control the TQWhatsThis text display area hlayout->addWidget(w, 1, TQt::AlignAuto); TQGridLayout* grid = new TQGridLayout(w, 4, 3, 0, KDialog::spacingHint()); - const KCalendarSystem* calendar = KGlobal::locale()->calendar(); + const KCalendarSystem* calendar = TDEGlobal::locale()->calendar(); int year = TQDate::currentDate().year(); for (int i = 0; i < 12; ++i) { |