From db2f713d0a0aaa32f8aa4d1fb05a0569c2f1e9d6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 15 Nov 2011 18:45:29 -0600 Subject: [PATCH] Rename KDE_VERSION to TDE_VERSION --- kdecompat.h | 4 ++-- kmymoney2/widgets/kmymoneycalendar.cpp | 6 +++--- kmymoney2/widgets/kmymoneydatetbl.cpp | 6 +++--- kmymoney2/widgets/kmymoneyedit.h | 2 +- kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kdecompat.h b/kdecompat.h index d7c1b0e..11766eb 100644 --- a/kdecompat.h +++ b/kdecompat.h @@ -24,14 +24,14 @@ #endif #ifndef KDE_IS_VERSION -#define KDE_IS_VERSION(a,b,c) (KDE_VERSION >= KDE_MAKE_VERSION(a,b,c)) +#define KDE_IS_VERSION(a,b,c) (TDE_VERSION >= KDE_MAKE_VERSION(a,b,c)) #endif #ifndef QT_IS_VERSION #define QT_IS_VERSION(a,b,c) (QT_VERSION >= KDE_MAKE_VERSION(a,b,c)) #endif -#if KDE_VERSION < KDE_MAKE_VERSION(3,2,0) +#if TDE_VERSION < KDE_MAKE_VERSION(3,2,0) #define KDE_DEPRECATED #endif diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp index 6064b8d..d3ac4b4 100644 --- a/kmymoney2/widgets/kmymoneycalendar.cpp +++ b/kmymoney2/widgets/kmymoneycalendar.cpp @@ -336,7 +336,7 @@ kMyMoneyCalendar::yearBackwardClicked() void kMyMoneyCalendar::selectWeekClicked() { -#if KDE_VERSION >= 310 && KDE_VERSION <= 314 +#if TDE_VERSION >= 310 && TDE_VERSION <= 314 int week; KPopupFrame* popup = new KPopupFrame(this); KDateInternalWeekSelector* picker = new KDateInternalWeekSelector(/*fontsize, */popup); @@ -375,7 +375,7 @@ kMyMoneyCalendar::selectWeekClicked() void kMyMoneyCalendar::selectMonthClicked() { -#if KDE_VERSION >= 310 && KDE_VERSION <= 314 +#if TDE_VERSION >= 310 && TDE_VERSION <= 314 int month; KPopupFrame* popup = new KPopupFrame(this); KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(/*fontsize, */popup); @@ -407,7 +407,7 @@ kMyMoneyCalendar::selectMonthClicked() void kMyMoneyCalendar::selectYearClicked() { -#if KDE_VERSION >= 310 && KDE_VERSION <= 314 +#if TDE_VERSION >= 310 && TDE_VERSION <= 314 int year; KPopupFrame* popup = new KPopupFrame(this); KDateInternalYearSelector* picker = new KDateInternalYearSelector(fontsize, popup); diff --git a/kmymoney2/widgets/kmymoneydatetbl.cpp b/kmymoney2/widgets/kmymoneydatetbl.cpp index 79a8c7b..c2cfc1c 100644 --- a/kmymoney2/widgets/kmymoneydatetbl.cpp +++ b/kmymoney2/widgets/kmymoneydatetbl.cpp @@ -109,7 +109,7 @@ kMyMoneyDateTbl::paintCell(TQPainter *painter, int row, int col) // ----- font.setPointSize(fontsize); -#if KDE_VERSION < 310 +#if TDE_VERSION < 310 int firstWeekDay = KGlobal::locale()->weekStartsMonday() ? 1 : 0; #else int firstWeekDay = KGlobal::locale()->weekStartDay(); @@ -378,7 +378,7 @@ kMyMoneyDateTbl::contentsMouseReleaseEvent(TQMouseEvent *e) return; } -#if KDE_VERSION < 310 +#if TDE_VERSION < 310 int dayoff = KGlobal::locale()->weekStartsMonday() ? 1 : 0; #else int dayoff = KGlobal::locale()->weekStartDay(); @@ -571,7 +571,7 @@ void kMyMoneyDateTbl::contentsMouseMoveEvent(TQMouseEvent* e) return; } -#if KDE_VERSION < 310 +#if TDE_VERSION < 310 int firstWeekDay = KGlobal::locale()->weekStartsMonday() ? 1 : 0; #else int firstWeekDay = KGlobal::locale()->weekStartDay(); diff --git a/kmymoney2/widgets/kmymoneyedit.h b/kmymoney2/widgets/kmymoneyedit.h index 77c7a75..3aaacd1 100644 --- a/kmymoney2/widgets/kmymoneyedit.h +++ b/kmymoney2/widgets/kmymoneyedit.h @@ -42,7 +42,7 @@ class KPushButton; class MyMoneyMoney; class kMyMoneyCalculator; -#if KDE_VERSION <= KDE_MAKE_VERSION(3,1,0) +#if TDE_VERSION <= KDE_MAKE_VERSION(3,1,0) #define KDoubleValidator TQDoubleValidator #endif diff --git a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp index d8f053d..3c484a3 100644 --- a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp +++ b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp @@ -377,7 +377,7 @@ void kMyMoneyScheduledDateTbl::contentsMouseMoveEvent(TQMouseEvent* e) return; } - #if KDE_VERSION < 310 + #if TDE_VERSION < 310 int firstWeekDay = KGlobal::locale()->weekStartsMonday() ? 1 : 0; #else int firstWeekDay = KGlobal::locale()->weekStartDay();