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

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

Revision: 1086
          http://sourceforge.net/p/seq/svn/1086
Author:   cn187
Date:     2020-10-28 14:22:59 +0000 (Wed, 28 Oct 2020)
Log Message:
-----------
Replace Q3ToolBar with QToolbar

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

Modified: showeq/branches/pre_6_0_beta/src/editor.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/editor.cpp	2020-10-28 14:22:52 UTC (rev 1085)
+++ showeq/branches/pre_6_0_beta/src/editor.cpp	2020-10-28 14:22:59 UTC (rev 1086)
@@ -28,11 +28,11 @@
 #include <cerrno>
 
 #include <QApplication>
-#include <Q3ToolBar>
+#include <QToolBar>
 #include <QStatusBar>
-#include <Q3PopupMenu>
+#include <QMenu>
 #include <QMenuBar>
-#include <Q3MainWindow>
+#include <QMainWindow>
 #include <QFileDialog>
 #include <QToolButton>
 #include <Q3TextStream>
@@ -94,36 +94,27 @@
 };
 
 EditorWindow::EditorWindow(const char *fileName)
-     : Q3MainWindow( 0, "ShowEQ - Editor", Qt::WDestructiveClose )
+     : QMainWindow( 0, "ShowEQ - Editor", Qt::WDestructiveClose )
  {
-     int id;
-  
      QPixmap openIcon, saveIcon;
- 
-     fileTools = new Q3ToolBar( this, "file operations" );
+     openIcon = QPixmap( fileopen );
+     saveIcon = QPixmap( filesave );
 
+     fileTools = new QToolBar(this);
      fileTools->setLabel( tr( "File Operations" ) );
- 
-        openIcon = QPixmap( fileopen );
-	new QToolButton( openIcon, "Open File", QString::null,
-                               this, SLOT(load()), fileTools, "open file" );
-    
-        saveIcon = QPixmap( filesave );
-        new QToolButton( saveIcon, "Save File", QString::null,
-                               this, SLOT(save()), fileTools, "save file" );
- 
-     QMenu * file = new Q3PopupMenu( this );
+     fileTools->addAction(openIcon, "Open File", this, SLOT(load()));
+     fileTools->addAction(saveIcon, "Save File", this, SLOT(save()));
+     addToolBar(fileTools);
+
+     QMenu * file = new QMenu( this );
      menuBar()->insertItem( "&File", file );
- 
-     id = file->insertItem( openIcon, "&Open",
-                            this, SLOT(load()), Qt::CTRL+Qt::Key_O );
- 
-     id = file->insertItem( saveIcon, "&Save",
-                            this, SLOT(save()), Qt::CTRL+Qt::Key_S );
 
-     file->insertSeparator();
-     file->insertItem( "&Close Editor", this, SLOT(close()), Qt::CTRL+Qt::Key_W );
+     file->addAction( openIcon, "&Open", this, SLOT(load()), Qt::CTRL+Qt::Key_O );
 
+     file->addAction( saveIcon, "&Save", this, SLOT(save()), Qt::CTRL+Qt::Key_S );
+     file->addSeparator();
+     file->addAction( "&Close Editor", this, SLOT(close()), Qt::CTRL+Qt::Key_W );
+
      e = new QTextEdit( this, "editor" );
      e->setFocus();
      setCentralWidget( e );

Modified: showeq/branches/pre_6_0_beta/src/editor.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/editor.h	2020-10-28 14:22:52 UTC (rev 1085)
+++ showeq/branches/pre_6_0_beta/src/editor.h	2020-10-28 14:22:59 UTC (rev 1086)
@@ -23,15 +23,15 @@
 #ifndef EDITOR_H
 #define EDITOR_H
 
-#include <Q3MainWindow>
+#include <QMainWindow>
 #include <QCloseEvent>
 #include <QMenu>
 
 class QTextEdit;
-class Q3ToolBar;
+class QToolBar;
 class QMenu;
 
-class EditorWindow: public Q3MainWindow
+class EditorWindow: public QMainWindow
 {
     Q_OBJECT
 public:
@@ -50,7 +50,7 @@
 
 private:
     QTextEdit *e;
-    Q3ToolBar *fileTools;
+    QToolBar *fileTools;
     QString filename;
 };
 

Modified: showeq/branches/pre_6_0_beta/src/interface.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/interface.h	2020-10-28 14:22:52 UTC (rev 1085)
+++ showeq/branches/pre_6_0_beta/src/interface.h	2020-10-28 14:22:59 UTC (rev 1086)
@@ -35,7 +35,6 @@
 #include <QList>
 #include <QTimer>
 #include <QMessageBox>
-#include <Q3TabDialog>
 #include <QSpinBox>
 #include <QHash>
 #include <Q3TextStream>

Modified: showeq/branches/pre_6_0_beta/src/map.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/map.cpp	2020-10-28 14:22:52 UTC (rev 1085)
+++ showeq/branches/pre_6_0_beta/src/map.cpp	2020-10-28 14:22:59 UTC (rev 1086)
@@ -57,7 +57,6 @@
 #include <QEvent>
 #include <QPushButton>
 #include <QLayout>
-#include <Q3ToolBar>
 #include <QShortcut>
 #include <QColorDialog>
 #include <QFontDialog>

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