[Seq-cvs-commit] SF.net SVN: seq:[1100] showeq/branches/pre_6_0_beta/src

[<cn...@us...>]

Revision: 1100
          http://sourceforge.net/p/seq/svn/1100
Author:   cn187
Date:     2020-11-08 21:58:33 +0000 (Sun, 08 Nov 2020)
Log Message:
-----------
 Replace compatibility/deprecated enums with Qt4 equivalents

Modified Paths:
--------------
    showeq/branches/pre_6_0_beta/src/editor.cpp
    showeq/branches/pre_6_0_beta/src/interface.cpp
    showeq/branches/pre_6_0_beta/src/map.cpp
    showeq/branches/pre_6_0_beta/src/xmlconv.cpp

Modified: showeq/branches/pre_6_0_beta/src/editor.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/editor.cpp	2020-11-08 21:58:21 UTC (rev 1099)
+++ showeq/branches/pre_6_0_beta/src/editor.cpp	2020-11-08 21:58:33 UTC (rev 1100)
@@ -93,9 +93,10 @@
 };
 
 EditorWindow::EditorWindow(const char *fileName)
-     : QMainWindow( 0, Qt::WDestructiveClose )
+     : QMainWindow( 0 )
  {
      setObjectName("ShowEQ - Editor");
+     setAttribute(Qt::WA_DeleteOnClose);
      QPixmap openIcon, saveIcon;
      openIcon = QPixmap( fileopen );
      saveIcon = QPixmap( filesave );

Modified: showeq/branches/pre_6_0_beta/src/interface.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/interface.cpp	2020-11-08 21:58:21 UTC (rev 1099)
+++ showeq/branches/pre_6_0_beta/src/interface.cpp	2020-11-08 21:58:33 UTC (rev 1100)
@@ -148,7 +148,7 @@
     m_guildListWindow(0)
 {
   setObjectName(name);
-  setWindowFlags(Qt::WType_TopLevel);
+  setWindowFlags(Qt::Window);
 
   setDockOptions(QMainWindow::AnimatedDocks | QMainWindow::AllowNestedDocks);
 
@@ -5618,24 +5618,24 @@
     {
       QPalette p( QColor( 75, 123, 130 ) );
       qApp->setStyle("cde");
-      p.setColor( QPalette::Active, QColorGroup::Base, QColor( 55, 77, 78 ) );
-      p.setColor( QPalette::Inactive, QColorGroup::Base, QColor( 55, 77, 78 ) );
-      p.setColor( QPalette::Disabled, QColorGroup::Base, QColor( 55, 77, 78 ) );
-      p.setColor( QPalette::Active, QColorGroup::Highlight, Qt::white );
-      p.setColor( QPalette::Active, QColorGroup::HighlightedText, QColor( 55, 77, 78 ) );
-      p.setColor( QPalette::Inactive, QColorGroup::Highlight, Qt::white );
-      p.setColor( QPalette::Inactive, QColorGroup::HighlightedText, QColor( 55, 77, 78 ) );
-      p.setColor( QPalette::Disabled, QColorGroup::Highlight, Qt::white );
-      p.setColor( QPalette::Disabled, QColorGroup::HighlightedText, QColor( 55, 77, 78 ) );
-      p.setColor( QPalette::Active, QColorGroup::Foreground, Qt::white );
-      p.setColor( QPalette::Active, QColorGroup::Text, Qt::white );
-      p.setColor( QPalette::Active, QColorGroup::ButtonText, Qt::white );
-      p.setColor( QPalette::Inactive, QColorGroup::Foreground, Qt::white );
-      p.setColor( QPalette::Inactive, QColorGroup::Text, Qt::white );
-      p.setColor( QPalette::Inactive, QColorGroup::ButtonText, Qt::white );
-      p.setColor( QPalette::Disabled, QColorGroup::Foreground, Qt::lightGray );
-      p.setColor( QPalette::Disabled, QColorGroup::Text, Qt::lightGray );
-      p.setColor( QPalette::Disabled, QColorGroup::ButtonText, Qt::lightGray );
+      p.setColor( QPalette::Active, QPalette::Base, QColor( 55, 77, 78 ) );
+      p.setColor( QPalette::Inactive, QPalette::Base, QColor( 55, 77, 78 ) );
+      p.setColor( QPalette::Disabled, QPalette::Base, QColor( 55, 77, 78 ) );
+      p.setColor( QPalette::Active, QPalette::Highlight, Qt::white );
+      p.setColor( QPalette::Active, QPalette::HighlightedText, QColor( 55, 77, 78 ) );
+      p.setColor( QPalette::Inactive, QPalette::Highlight, Qt::white );
+      p.setColor( QPalette::Inactive, QPalette::HighlightedText, QColor( 55, 77, 78 ) );
+      p.setColor( QPalette::Disabled, QPalette::Highlight, Qt::white );
+      p.setColor( QPalette::Disabled, QPalette::HighlightedText, QColor( 55, 77, 78 ) );
+      p.setColor( QPalette::Active, QPalette::Foreground, Qt::white );
+      p.setColor( QPalette::Active, QPalette::Text, Qt::white );
+      p.setColor( QPalette::Active, QPalette::ButtonText, Qt::white );
+      p.setColor( QPalette::Inactive, QPalette::Foreground, Qt::white );
+      p.setColor( QPalette::Inactive, QPalette::Text, Qt::white );
+      p.setColor( QPalette::Inactive, QPalette::ButtonText, Qt::white );
+      p.setColor( QPalette::Disabled, QPalette::Foreground, Qt::lightGray );
+      p.setColor( QPalette::Disabled, QPalette::Text, Qt::lightGray );
+      p.setColor( QPalette::Disabled, QPalette::ButtonText, Qt::lightGray );
       qApp->setPalette(p);
       qApp->setFont( QFont( "times", OrigFont.pointSize() ) );
     }

Modified: showeq/branches/pre_6_0_beta/src/map.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/map.cpp	2020-11-08 21:58:21 UTC (rev 1099)
+++ showeq/branches/pre_6_0_beta/src/map.cpp	2020-11-08 21:58:33 UTC (rev 1100)
@@ -202,8 +202,8 @@
 // MapLabel
 MapLabel::MapLabel( Map* map )
   : QLabel(map,
-       Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool | Qt::WType_TopLevel
-       | Qt::WType_Dialog | Qt::WX11BypassWM)
+       Qt::FramelessWindowHint | Qt::Tool | Qt::Window
+       | Qt::Dialog | Qt::X11BypassWindowManagerHint)
 {
   this->setObjectName("mapLabel");
   m_Map = map;

Modified: showeq/branches/pre_6_0_beta/src/xmlconv.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/xmlconv.cpp	2020-11-08 21:58:21 UTC (rev 1099)
+++ showeq/branches/pre_6_0_beta/src/xmlconv.cpp	2020-11-08 21:58:33 UTC (rev 1100)
@@ -243,9 +243,9 @@
     QSizePolicy sp;
     
     if (e.hasAttribute("hsizetype"))
-      sp.setHorizontalPolicy((QSizePolicy::SizeType)e.attribute("hsizetype").toInt());
+      sp.setHorizontalPolicy((QSizePolicy::Policy)e.attribute("hsizetype").toInt());
     if (e.hasAttribute("vsizetype"))
-      sp.setVerticalPolicy((QSizePolicy::SizeType)e.attribute("vsizetype").toInt());
+      sp.setVerticalPolicy((QSizePolicy::Policy)e.attribute("vsizetype").toInt());
     if (e.hasAttribute("horstretch"))
       sp.setHorizontalStretch(e.attribute("horstretch").toInt());
     if (e.hasAttribute("verstretch"))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.