Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KOrganizer
Commits
a4738f1e
Commit
a4738f1e
authored
Apr 03, 2016
by
Volker Krause
Browse files
Port away from KLocale.
parent
a73cce41
Changes
2
Hide whitespace changes
Inline
Side-by-side
actionmanager.cpp
View file @
a4738f1e
...
...
@@ -94,7 +94,6 @@
#include
<QApplication>
#include
<QTimer>
#include
<KSharedConfig>
#include
<KLocale>
#include
<QStandardPaths>
KOWindowList
*
ActionManager
::
mWindowList
=
Q_NULLPTR
;
...
...
@@ -1793,7 +1792,7 @@ void ActionManager::goDate(const QDate &date)
void
ActionManager
::
goDate
(
const
QString
&
date
)
{
goDate
(
K
Locale
::
global
()
->
read
Date
(
date
));
goDate
(
Q
Locale
().
to
Date
(
date
));
}
void
ActionManager
::
showDate
(
const
QDate
&
date
)
...
...
autotests/testkodaymatrix.cpp
View file @
a4738f1e
...
...
@@ -23,7 +23,7 @@
#include
"../kodaymatrix.h"
#include
<qtest.h>
#include
<
K
Locale>
#include
<
Q
Locale>
QTEST_MAIN
(
KODayMatrixTest
)
typedef
QPair
<
QDate
,
QDate
>
DateRange
;
...
...
@@ -31,7 +31,7 @@ typedef QPair<QDate, QDate> DateRange;
void
KODayMatrixTest
::
testMatrixLimits
()
{
QMap
<
QDate
,
DateRange
>
dates
;
K
Locale
::
global
()
->
setWeekStartDay
(
1
);
//
Monday
Q
Locale
::
setDefault
(
QLocale
(
QStringLiteral
(
"de_DE"
)));
// week start on
Monday
dates
.
insert
(
QDate
(
2011
,
1
,
1
),
DateRange
(
QDate
(
2010
,
12
,
27
),
QDate
(
2011
,
2
,
6
)));
dates
.
insert
(
QDate
(
2011
,
2
,
1
),
DateRange
(
QDate
(
2011
,
1
,
31
),
QDate
(
2011
,
3
,
13
)));
dates
.
insert
(
QDate
(
2011
,
3
,
1
),
DateRange
(
QDate
(
2011
,
2
,
28
),
QDate
(
2011
,
4
,
10
)));
...
...
@@ -47,8 +47,7 @@ void KODayMatrixTest::testMatrixLimits()
}
QMap
<
QDate
,
DateRange
>
dates2
;
KLocale
::
global
()
->
setWeekStartDay
(
1
);
// Monday
KLocale
::
global
()
->
setWeekStartDay
(
7
);
// Sunday
QLocale
::
setDefault
(
QLocale
(
QStringLiteral
(
"en_US"
)));
// week start on Sunday
dates2
.
insert
(
QDate
(
2011
,
1
,
1
),
DateRange
(
QDate
(
2010
,
12
,
26
),
QDate
(
2011
,
2
,
5
)));
dates2
.
insert
(
QDate
(
2011
,
2
,
1
),
DateRange
(
QDate
(
2011
,
1
,
30
),
QDate
(
2011
,
3
,
12
)));
dates2
.
insert
(
QDate
(
2011
,
3
,
1
),
DateRange
(
QDate
(
2011
,
2
,
27
),
QDate
(
2011
,
4
,
9
)));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment