summaryrefslogtreecommitdiffstats
path: root/korganizer/kdatenavigator.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /korganizer/kdatenavigator.cpp
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/kdatenavigator.cpp')
-rw-r--r--korganizer/kdatenavigator.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 087804103..dcf2a3ebd 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -61,7 +61,7 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name )
connect( mNavigatorBar, TQT_SIGNAL( yearSelected( int ) ), TQT_SIGNAL( yearSelected( int ) ) );
int i;
- TQString generalFont = KGlobalSettings::generalFont().family();
+ TQString generalFont = TDEGlobalSettings::generalFont().family();
// Set up the heading fields.
for( i = 0; i < 7; i++ ) {
@@ -149,7 +149,7 @@ TQDate KDateNavigator::startDate() const
const KCalendarSystem *calsys = KOGlobals::self()->calendarSystem();
int m_fstDayOfWkCalsys = calsys->dayOfWeek( dayone );
- int weekstart = KGlobal::locale()->weekStartDay();
+ int weekstart = TDEGlobal::locale()->weekStartDay();
// If month begins on Monday and Monday is first day of week,
// month should begin on second line. Sunday doesn't have this problem.
@@ -234,7 +234,7 @@ void KDateNavigator::updateView()
void KDateNavigator::updateConfig()
{
int day;
- int weekstart = KGlobal::locale()->weekStartDay();
+ int weekstart = TDEGlobal::locale()->weekStartDay();
for( int i = 0; i < 7; i++ ) {
day = weekstart + i <= 7 ? weekstart + i : ( weekstart + i ) % 7;
TQString dayName = KOGlobals::self()->calendarSystem()->weekDayName( day,