Copyright update 2022

[modules/gui.git] / src / OCCViewer / OCCViewer_ViewPort.cxx

diff --git a/src/OCCViewer/OCCViewer_ViewPort.cxx b/src/OCCViewer/OCCViewer_ViewPort.cxx
old mode 100755 (executable)
new mode 100644 (file)
index d0d2ce1..9316db5
--- a/src/OCCViewer/OCCViewer_ViewPort.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -115,15 +115,6 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi )
   //cout << "Choosing cmap for vID = " << vi->visualid << endl;
   //#endif
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-  if ( vi->visualid == XVisualIDFromVisual( (Visual*)QX11Info::appVisual() ) )
-  {
-#ifdef DEBUG
-//    cout << "Using x11AppColormap" << endl;
-#endif
-    return QX11Info::appColormap();
-  }
-#else
   if ( vi->visualid == XVisualIDFromVisual( XDefaultVisual( QX11Info::display(), -1 ) ) )
   {
 #ifdef DEBUG
@@ -131,7 +122,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi )
 #endif
     return XDefaultColormap( QX11Info::display(), -1 );
   }
-#endif
+
   if ( mesa_gl )
   {
     Atom hp_cmaps = XInternAtom( dpy, "_HP_RGB_SMOOTH_MAP_LIST", true );
@@ -218,9 +209,7 @@ void OCCViewer_ViewPort::initialize()
   setBackgroundRole( QPalette::NoRole );//NoBackground );
   // set focus policy to threat QContextMenuEvent from keyboard  
   setFocusPolicy( Qt::StrongFocus );
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0) && OCC_VERSION_LARGE < 0x07000000) || QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
   setAttribute( Qt::WA_PaintOnScreen );
-#endif
   setAttribute( Qt::WA_NoSystemBackground );
 }