[midisnoop] push by surfacep...@gmail.com - Do the minimum necessary to make midisnoop compile against Qt5. Note ... on 2014-01-01 05:59 GMT

[midi...@googlecode.com]

Revision: 0125fc1e423e
Author: Devin Anderson <surface...@gmail.com>
Date: Wed Jan 1 05:59:45 2014 UTC
Log: Do the minimum necessary to make midisnoop compile against Qt5.
Note that midisnoop will no longer compile against Qt4.

http://code.google.com/p/midisnoop/source/detail?r=0125fc1e423e

Modified:
/src/aboutview.h
/src/application.h
/src/configureview.h
/src/dialogview.cpp
/src/dialogview.h
/src/errorview.h
/src/mainview.cpp
/src/mainview.h
/src/messagetabledelegate.cpp
/src/messagetabledelegate.h
/src/messageview.h
/src/src.pro
/src/util.h
/src/view.h

=======================================
--- /src/aboutview.h Sun Dec 30 09:18:51 2012 UTC
+++ /src/aboutview.h Wed Jan 1 05:59:45 2014 UTC
@@ -20,8 +20,8 @@
#ifndef __ABOUTVIEW_H__
#define __ABOUTVIEW_H__

-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>

#include "dialogview.h"

=======================================
--- /src/application.h Sun Dec 30 09:18:51 2012 UTC
+++ /src/application.h Wed Jan 1 05:59:45 2014 UTC
@@ -20,7 +20,7 @@
#ifndef __APPLICATION_H__
#define __APPLICATION_H__

-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>

class Application: public QApplication {

=======================================
--- /src/configureview.h Sun Dec 30 09:18:51 2012 UTC
+++ /src/configureview.h Wed Jan 1 05:59:45 2014 UTC
@@ -20,9 +20,9 @@
#ifndef __CONFIGUREVIEW_H__
#define __CONFIGUREVIEW_H__

-#include <QtGui/QCheckBox>
-#include <QtGui/QComboBox>
-#include <QtGui/QPushButton>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QPushButton>

#include "designerview.h"

=======================================
--- /src/dialogview.cpp Sun Dec 30 09:18:51 2012 UTC
+++ /src/dialogview.cpp Wed Jan 1 05:59:45 2014 UTC
@@ -19,7 +19,7 @@

#include <cassert>

-#include <QtGui/QLayout>
+#include <QtWidgets/QLayout>

#include "dialogview.h"

=======================================
--- /src/dialogview.h Sun Dec 30 09:18:51 2012 UTC
+++ /src/dialogview.h Wed Jan 1 05:59:45 2014 UTC
@@ -20,7 +20,7 @@
#ifndef __DIALOGVIEW_H__
#define __DIALOGVIEW_H__

-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>

#include "designerview.h"

=======================================
--- /src/errorview.h Sun Dec 30 09:18:51 2012 UTC
+++ /src/errorview.h Wed Jan 1 05:59:45 2014 UTC
@@ -20,8 +20,8 @@
#ifndef __ERRORVIEW_H__
#define __ERRORVIEW_H__

-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>

#include "dialogview.h"

=======================================
--- /src/mainview.cpp Mon Dec 31 21:11:12 2012 UTC
+++ /src/mainview.cpp Wed Jan 1 05:59:45 2014 UTC
@@ -19,7 +19,7 @@

#include <cassert>

-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>

#include "mainview.h"
#include "util.h"
=======================================
--- /src/mainview.h Mon Dec 31 21:11:12 2012 UTC
+++ /src/mainview.h Wed Jan 1 05:59:45 2014 UTC
@@ -20,10 +20,10 @@
#ifndef __MAINVIEW_H__
#define __MAINVIEW_H__

-#include <QtGui/QAction>
-#include <QtGui/QMainWindow>
#include <QtGui/QStandardItemModel>
-#include <QtGui/QTableView>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QTableView>

#include "designerview.h"
#include "messagetabledelegate.h"
=======================================
--- /src/messagetabledelegate.cpp Mon Dec 31 21:11:12 2012 UTC
+++ /src/messagetabledelegate.cpp Wed Jan 1 05:59:45 2014 UTC
@@ -17,9 +17,9 @@
* Ave, Cambridge, MA 02139, USA.
*/

-#include <QtGui/QApplication>
-#include <QtGui/QTextEdit>
#include <QtGui/QTextFrame>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QTextEdit>

#include "messagetabledelegate.h"

=======================================
--- /src/messagetabledelegate.h Mon Dec 31 21:11:12 2012 UTC
+++ /src/messagetabledelegate.h Wed Jan 1 05:59:45 2014 UTC
@@ -20,7 +20,7 @@
#ifndef __MESSAGETABLEDELEGATE_H__
#define __MESSAGETABLEDELEGATE_H__

-#include <QtGui/QStyledItemDelegate>
+#include <QtWidgets/QStyledItemDelegate>

class MessageTableDelegate: public QStyledItemDelegate {

=======================================
--- /src/messageview.h Sun Dec 30 09:18:51 2012 UTC
+++ /src/messageview.h Wed Jan 1 05:59:45 2014 UTC
@@ -20,8 +20,8 @@
#ifndef __MESSAGEVIEW_H__
#define __MESSAGEVIEW_H__

-#include <QtGui/QPlainTextEdit>
-#include <QtGui/QPushButton>
+#include <QtWidgets/QPlainTextEdit>
+#include <QtWidgets/QPushButton>

#include "designerview.h"

=======================================
--- /src/src.pro Sat Mar 2 06:21:58 2013 UTC
+++ /src/src.pro Wed Jan 1 05:59:45 2014 UTC
@@ -63,7 +63,7 @@
MIDISNOOP_DATA_INSTALL_PATH = $${DATADIR}
}

-CONFIG += console uitools warn_on
+CONFIG += console warn_on
DEFINES += MIDISNOOP_MAJOR_VERSION=$${MAJOR_VERSION} \
MIDISNOOP_MINOR_VERSION=$${MINOR_VERSION} \
MIDISNOOP_REVISION=$${REVISION}
@@ -86,6 +86,7 @@
LIBS += -lrtmidi
MOC_DIR = $${MAKEDIR}
OBJECTS_DIR = $${MAKEDIR}
+QT += core gui uitools widgets
RCC_DIR = $${MAKEDIR}
RESOURCES += resources.qrc
SOURCES += aboutview.cpp \
=======================================
--- /src/util.h Sun Dec 30 09:18:51 2012 UTC
+++ /src/util.h Wed Jan 1 05:59:45 2014 UTC
@@ -22,13 +22,13 @@

#include <cassert>

-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>

template<typename T>
inline T *
getChild(const QObject *object, const QString &name=QString())
{
- T *child = qFindChild<T *>(object, name);
+ T *child = object->findChild<T *>(name);
assert(child);
return child;
}
=======================================
--- /src/view.h Sun Dec 30 09:18:51 2012 UTC
+++ /src/view.h Wed Jan 1 05:59:45 2014 UTC
@@ -20,7 +20,7 @@
#ifndef __VIEW_H__
#define __VIEW_H__

-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>

#include "closeeventfilter.h"