Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove QT4 compatibility.
[modules/gui.git]
/
src
/
Style
/
Style_Salome.cxx
diff --git
a/src/Style/Style_Salome.cxx
b/src/Style/Style_Salome.cxx
index f0c01a3ed76664ec46a44d19a432913e22750347..2e3012529f1efd5409722c8e4d89f48507190b11 100644
(file)
--- a/
src/Style/Style_Salome.cxx
+++ b/
src/Style/Style_Salome.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-1638,9
+1638,6
@@
void Style_Salome::drawPrimitive( PrimitiveElement pe, const QStyleOption* opt,
p->setPen(opt->palette.text().color());
} // Fall through!
case PE_IndicatorViewItemCheck:
p->setPen(opt->palette.text().color());
} // Fall through!
case PE_IndicatorViewItemCheck:
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- case PE_Q3CheckListIndicator:
-#endif
{
if (!doRestore) {
p->save();
{
if (!doRestore) {
p->save();
@@
-2107,11
+2104,7
@@
QIcon Style_Salome::standardIconImplementation( StandardPixmap standardIcon,
const QWidget* w ) const
{
if ( checkDebugLevel(10) ) {
const QWidget* w ) const
{
if ( checkDebugLevel(10) ) {
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- return BaseStyle::standardIconImplementation( standardIcon, opt, w );
-#else
return QCommonStyle::standardIcon( standardIcon, opt, w );
return QCommonStyle::standardIcon( standardIcon, opt, w );
-#endif
}
switch ( standardIcon )
}
switch ( standardIcon )
@@
-2127,11
+2120,7
@@
QIcon Style_Salome::standardIconImplementation( StandardPixmap standardIcon,
default:
break;
}
default:
break;
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- return BaseStyle::standardIconImplementation( standardIcon, opt, w );
-#else
return BaseStyle::standardIcon( standardIcon, opt, w );
return BaseStyle::standardIcon( standardIcon, opt, w );
-#endif
}
/*!
}
/*!