-rw-r--r-- | korganizer/ktimeedit.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/korganizer/ktimeedit.cpp b/korganizer/ktimeedit.cpp index cf07a1a..f5a1c50 100644 --- a/korganizer/ktimeedit.cpp +++ b/korganizer/ktimeedit.cpp | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <kglobal.h> | 31 | #include <kglobal.h> |
32 | #include <kdebug.h> | 32 | #include <kdebug.h> |
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | #include <kpimglobalprefs.h> | ||
34 | 35 | ||
35 | #include "ktimeedit.h" | 36 | #include "ktimeedit.h" |
36 | #include "koprefs.h" | 37 | #include "koprefs.h" |
@@ -111,7 +112,7 @@ KOTimeEdit::KOTimeEdit(QWidget *parent, QTime qt, const char *name) | |||
111 | connect(this,SIGNAL(textChanged(const QString&)),this,SLOT(changedText())); | 112 | connect(this,SIGNAL(textChanged(const QString&)),this,SLOT(changedText())); |
112 | QFontMetrics fm ( font() ); | 113 | QFontMetrics fm ( font() ); |
113 | QString timeString = "24:00"; | 114 | QString timeString = "24:00"; |
114 | if ( KOPrefs::instance()->mPreferredTime == 1 ) | 115 | if ( KPimGlobalPrefs::instance()->mPreferredTime == 1 ) |
115 | timeString = "02:00pm"; | 116 | timeString = "02:00pm"; |
116 | int addSpace = 32; | 117 | int addSpace = 32; |
117 | if ( QApplication::desktop()->width() > 320 ) | 118 | if ( QApplication::desktop()->width() > 320 ) |
@@ -238,7 +239,7 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e) | |||
238 | { | 239 | { |
239 | 240 | ||
240 | qApp->processEvents(); | 241 | qApp->processEvents(); |
241 | bool hour12Format = ( KOPrefs::instance()->mPreferredTime == 1 ); | 242 | bool hour12Format = ( KPimGlobalPrefs::instance()->mPreferredTime == 1 ); |
242 | int maxpos = hour12Format?7:5; | 243 | int maxpos = hour12Format?7:5; |
243 | if ( e->isAutoRepeat() && !mFlagKeyPressed ) { | 244 | if ( e->isAutoRepeat() && !mFlagKeyPressed ) { |
244 | e->ignore(); | 245 | e->ignore(); |