Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SDK
Umbrello
Commits
de3c8823
Commit
de3c8823
authored
May 20, 2015
by
Ralf Habacker
Browse files
Qt5 port of Q_WS_xxx macro usage to Q_OS_xxx.
parent
2deb55cd
Changes
3
Hide whitespace changes
Inline
Side-by-side
umbrello/codeimport/idlimport.cpp
View file @
de3c8823
...
...
@@ -53,7 +53,7 @@ IDLImport::IDLImport(CodeImpThread* thread) : NativeImportBase(QLatin1String("//
if
(
!
executable
.
isEmpty
())
{
arguments
<<
QLatin1String
(
"-C"
);
// -C means "preserve comments"
}
#ifdef Q_
W
S_WIN
#ifdef Q_
O
S_WIN
else
{
executable
=
KStandardDirs
::
findExe
(
QLatin1String
(
"cl"
));
if
(
executable
.
isEmpty
())
{
...
...
umbrello/layoutgenerator.cpp
View file @
de3c8823
...
...
@@ -41,10 +41,10 @@
static
QString
pngViewer
()
{
#ifdef Q_
W
S_WIN
#ifdef Q_
O
S_WIN
return
QLatin1String
(
"start"
);
#else
#ifdef Q_
W
S_MAC
#ifdef Q_
O
S_MAC
return
QLatin1String
(
"unknown"
);
#else
return
QLatin1String
(
"okular"
);
...
...
@@ -54,10 +54,10 @@ static QString pngViewer()
static
QString
textViewer
()
{
#ifdef Q_
W
S_WIN
#ifdef Q_
O
S_WIN
return
QLatin1String
(
"start"
);
#else
#ifdef Q_
W
S_MAC
#ifdef Q_
O
S_MAC
return
QLatin1String
(
"unknown"
);
#else
return
QLatin1String
(
"mcedit"
);
...
...
umbrello/umldoc.cpp
View file @
de3c8823
...
...
@@ -743,7 +743,7 @@ bool UMLDoc::saveDocument(const KUrl& url, const char * format)
}
else
{
// now remove the original file
#ifdef Q_
W
S_WIN
#ifdef Q_
O
S_WIN
tmpfile
.
setAutoRemove
(
true
);
KIO
::
FileCopyJob
*
fcj
=
KIO
::
file_copy
(
tmpfile
.
fileName
(),
url
,
-
1
,
KIO
::
Overwrite
);
#else
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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