Revision: 76204
http://sourceforge.net/p/brlcad/code/76204
Author: starseeker
Date: 2020-06-25 19:31:17 +0000 (Thu, 25 Jun 2020)
Log Message:
-----------
Qt headers need to come first, before our defines can mess with them.
Modified Paths:
--------------
brlcad/branches/qtged/src/qged/cadaccordion.cxx
brlcad/branches/qtged/src/qged/cadapp.cxx
brlcad/branches/qtged/src/qged/cadappexec.cxx
brlcad/branches/qtged/src/qged/cadconsole.cxx
brlcad/branches/qtged/src/qged/cadhelp.cxx
brlcad/branches/qtged/src/qged/cadtreeview.cxx
brlcad/branches/qtged/src/qged/console.cxx
brlcad/branches/qtged/src/qged/main.cxx
Modified: brlcad/branches/qtged/src/qged/cadaccordion.cxx
===================================================================
--- brlcad/branches/qtged/src/qged/cadaccordion.cxx 2020-06-25 19:11:43 UTC
(rev 76203)
+++ brlcad/branches/qtged/src/qged/cadaccordion.cxx 2020-06-25 19:31:17 UTC
(rev 76204)
@@ -1,8 +1,9 @@
-#include "cadaccordion.h"
-#include "cadapp.h"
#include <QPalette>
#include <QColor>
+#include "cadaccordion.h"
+#include "cadapp.h"
+
CADViewControls::CADViewControls(QWidget *pparent)
: QWidget(pparent)
{
Modified: brlcad/branches/qtged/src/qged/cadapp.cxx
===================================================================
--- brlcad/branches/qtged/src/qged/cadapp.cxx 2020-06-25 19:11:43 UTC (rev
76203)
+++ brlcad/branches/qtged/src/qged/cadapp.cxx 2020-06-25 19:31:17 UTC (rev
76204)
@@ -23,13 +23,13 @@
*
*/
-#include "cadapp.h"
-#include "cadappexec.h"
-#include "cadaccordion.h"
#include <QFileInfo>
#include <QFile>
#include <QPlainTextEdit>
#include <QTextStream>
+#include "cadapp.h"
+#include "cadappexec.h"
+#include "cadaccordion.h"
#include "bu/malloc.h"
#include "bu/file.h"
Modified: brlcad/branches/qtged/src/qged/cadappexec.cxx
===================================================================
--- brlcad/branches/qtged/src/qged/cadappexec.cxx 2020-06-25 19:11:43 UTC
(rev 76203)
+++ brlcad/branches/qtged/src/qged/cadappexec.cxx 2020-06-25 19:31:17 UTC
(rev 76204)
@@ -23,11 +23,11 @@
*
*/
-#include "cadappexec.h"
#include <QFileInfo>
#include <QFile>
#include <QPlainTextEdit>
#include <QTextStream>
+#include "cadappexec.h"
QDialog_App::QDialog_App(QWidget *pparent, QString executable, QStringList
args, QString lfile) : QDialog(pparent)
{
Modified: brlcad/branches/qtged/src/qged/cadconsole.cxx
===================================================================
--- brlcad/branches/qtged/src/qged/cadconsole.cxx 2020-06-25 19:11:43 UTC
(rev 76203)
+++ brlcad/branches/qtged/src/qged/cadconsole.cxx 2020-06-25 19:31:17 UTC
(rev 76204)
@@ -44,10 +44,10 @@
the U.S. Government retains certain rights in this software.
-------------------------------------------------------------------------*/
+#include <QVBoxLayout>
+#include <QApplication>
#include "console.h"
#include "cadconsole.h"
-#include <QVBoxLayout>
-#include <QApplication>
#include "cadapp.h"
//=============================================================================
Modified: brlcad/branches/qtged/src/qged/cadhelp.cxx
===================================================================
--- brlcad/branches/qtged/src/qged/cadhelp.cxx 2020-06-25 19:11:43 UTC (rev
76203)
+++ brlcad/branches/qtged/src/qged/cadhelp.cxx 2020-06-25 19:31:17 UTC (rev
76204)
@@ -1,7 +1,7 @@
+#include <iostream>
+#include <QFile>
#include "cadhelp.h"
#include "cadapp.h"
-#include <iostream>
-#include <QFile>
#include "bu.h"
Modified: brlcad/branches/qtged/src/qged/cadtreeview.cxx
===================================================================
--- brlcad/branches/qtged/src/qged/cadtreeview.cxx 2020-06-25 19:11:43 UTC
(rev 76203)
+++ brlcad/branches/qtged/src/qged/cadtreeview.cxx 2020-06-25 19:31:17 UTC
(rev 76204)
@@ -1,16 +1,15 @@
-#include "cadtreemodel.h"
-#include "cadtreeview.h"
-#include "cadtreenode.h"
-
#include <iostream>
#include <QPainter>
#include <qmath.h>
+#include <QAction>
+#include <QMenu>
+
#include "raytrace.h"
#include "cadapp.h"
+#include "cadtreemodel.h"
+#include "cadtreeview.h"
+#include "cadtreenode.h"
-#include <QAction>
-#include <QMenu>
-
void GObjectDelegate::paint(QPainter *painter, const QStyleOptionViewItem
&option, const QModelIndex &index) const
{
struct directory *cdp = RT_DIR_NULL;
Modified: brlcad/branches/qtged/src/qged/console.cxx
===================================================================
--- brlcad/branches/qtged/src/qged/console.cxx 2020-06-25 19:11:43 UTC (rev
76203)
+++ brlcad/branches/qtged/src/qged/console.cxx 2020-06-25 19:31:17 UTC (rev
76204)
@@ -1,5 +1,4 @@
#include <iostream>
-#include "console.h"
#include <QVBoxLayout>
#include <QScrollArea>
#include <QScrollBar>
@@ -6,6 +5,7 @@
#include <QFontDatabase>
#include <QFont>
+#include "console.h"
#include "cadapp.h"
#include "cadtreeview.h"
Modified: brlcad/branches/qtged/src/qged/main.cxx
===================================================================
--- brlcad/branches/qtged/src/qged/main.cxx 2020-06-25 19:11:43 UTC (rev
76203)
+++ brlcad/branches/qtged/src/qged/main.cxx 2020-06-25 19:31:17 UTC (rev
76204)
@@ -23,9 +23,6 @@
*
*/
-#include "bu/log.h"
-#include "brlcad_version.h"
-
#include <iostream>
#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 6) &&
!defined(__clang__)
@@ -60,6 +57,9 @@
#include "cadapp.h"
#include "cadcommands.h"
+#include "bu/log.h"
+#include "brlcad_version.h"
+
int main(int argc, char *argv[])
{
CADApp app(argc, argv);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
