Author: mir3x
Date: Sat Jan 21 12:44:24 2017
New Revision: 34879
URL: http://svn.gna.org/viewcvs/freeciv?rev=34879&view=rev
Log:
Qt client - Added forward declarations in headers, added/removed includes
See patch #8083
Modified:
branches/S3_0/client/gui-qt/chatline.cpp
branches/S3_0/client/gui-qt/chatline.h
branches/S3_0/client/gui-qt/citydlg.cpp
branches/S3_0/client/gui-qt/dialogs.cpp
branches/S3_0/client/gui-qt/diplodlg.cpp
branches/S3_0/client/gui-qt/diplodlg.h
branches/S3_0/client/gui-qt/fc_client.cpp
branches/S3_0/client/gui-qt/fc_client.h
branches/S3_0/client/gui-qt/fonts.h
branches/S3_0/client/gui-qt/hudwidget.cpp
branches/S3_0/client/gui-qt/mapview.h
branches/S3_0/client/gui-qt/menu.cpp
branches/S3_0/client/gui-qt/messagewin.cpp
branches/S3_0/client/gui-qt/messagewin.h
branches/S3_0/client/gui-qt/optiondlg.cpp
branches/S3_0/client/gui-qt/pages.cpp
branches/S3_0/client/gui-qt/plrdlg.cpp
branches/S3_0/client/gui-qt/ratesdlg.cpp
branches/S3_0/client/gui-qt/ratesdlg.h
branches/S3_0/client/gui-qt/shortcuts.h
branches/S3_0/client/gui-qt/spaceshipdlg.cpp
branches/S3_0/client/gui-qt/voteinfo_bar.cpp
Modified: branches/S3_0/client/gui-qt/chatline.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/chatline.cpp?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/chatline.cpp (original)
+++ branches/S3_0/client/gui-qt/chatline.cpp Sat Jan 21 12:44:24 2017
@@ -17,11 +17,14 @@
//Qt
#include <QApplication>
+#include <QCheckBox>
#include <QCompleter>
+#include <QGridLayout>
#include <QKeyEvent>
#include <QPainter>
#include <QScrollBar>
#include <QStyleFactory>
+#include <QTextBrowser>
// common
#include "chat.h"
Modified: branches/S3_0/client/gui-qt/chatline.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/chatline.h?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/chatline.h (original)
+++ branches/S3_0/client/gui-qt/chatline.h Sat Jan 21 12:44:24 2017
@@ -23,18 +23,17 @@
}
// Qt
-#include <QCheckBox>
#include <QEvent>
#include <QLineEdit>
-#include <QStringList>
-#include <QTextBrowser>
// gui-qt
#include "fonts.h"
#include "listener.h"
+class chat_listener;
+class QCheckBox;
class QPushButton;
-class chat_listener;
+class QTextBrowser;
QString apply_tags(QString str, const struct text_tag_list *tags,
QColor bg_color);
template<> std::set<chat_listener *> listener<chat_listener>::instances;
Modified: branches/S3_0/client/gui-qt/citydlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/citydlg.cpp?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/citydlg.cpp (original)
+++ branches/S3_0/client/gui-qt/citydlg.cpp Sat Jan 21 12:44:24 2017
@@ -17,7 +17,9 @@
// Qt
#include <QApplication>
+#include <QCheckBox>
#include <QDesktopWidget>
+#include <QGroupBox>
#include <QHeaderView>
#include <QImage>
#include <QMenu>
Modified: branches/S3_0/client/gui-qt/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/dialogs.cpp?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/dialogs.cpp (original)
+++ branches/S3_0/client/gui-qt/dialogs.cpp Sat Jan 21 12:44:24 2017
@@ -29,6 +29,7 @@
#include <QSignalMapper>
#include <QTableWidgetItem>
#include <QTextEdit>
+#include <QVBoxLayout>
#include <QtMath>
// utility
Modified: branches/S3_0/client/gui-qt/diplodlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/diplodlg.cpp?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/diplodlg.cpp (original)
+++ branches/S3_0/client/gui-qt/diplodlg.cpp Sat Jan 21 12:44:24 2017
@@ -18,8 +18,11 @@
// Qt
#include <QApplication>
#include <QCloseEvent>
+#include <QGridLayout>
+#include <QHeaderView>
#include <QLabel>
#include <QMenu>
+#include <QSpinBox>
#include <QPainter>
#include <QPushButton>
Modified: branches/S3_0/client/gui-qt/diplodlg.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/diplodlg.h?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/diplodlg.h (original)
+++ branches/S3_0/client/gui-qt/diplodlg.h Sat Jan 21 12:44:24 2017
@@ -19,14 +19,8 @@
#endif
// Qt
-#include <QHeaderView>
-#include <QLayout>
#include <QMap>
-#include <QSpinBox>
-#include <QStyle>
-#include <QTableWidget>
#include <QTabWidget>
-#include <QWidget>
extern "C" {
#include "diplodlg_g.h"
@@ -40,9 +34,14 @@
#include "sprite.h"
#include "tilespec.h"
+class QCloseEvent;
+class QGridLayout;
class QIcon;
class QLabel;
class QPushButton;
+class QSpinBox;
+class QTableWidget;
+class QTableWidgetItem;
/****************************************************************************
Diplomacy tab for one nation
Modified: branches/S3_0/client/gui-qt/fc_client.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/fc_client.cpp?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/fc_client.cpp (original)
+++ branches/S3_0/client/gui-qt/fc_client.cpp Sat Jan 21 12:44:24 2017
@@ -17,6 +17,7 @@
// Qt
#include <QApplication>
+#include <QComboBox>
#include <QFormLayout>
#include <QLineEdit>
#include <QMainWindow>
@@ -26,6 +27,7 @@
#include <QSettings>
#include <QSignalMapper>
#include <QSocketNotifier>
+#include <QSpinBox>
#include <QStackedLayout>
#include <QStandardPaths>
#include <QStatusBar>
Modified: branches/S3_0/client/gui-qt/fc_client.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/fc_client.h?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/fc_client.h (original)
+++ branches/S3_0/client/gui-qt/fc_client.h Sat Jan 21 12:44:24 2017
@@ -23,10 +23,7 @@
#endif
// Qt
-#include <QComboBox>
#include <QMainWindow>
-#include <QMap>
-#include <QSpinBox>
#include <QStackedWidget>
// common
@@ -72,6 +69,7 @@
class QLineEdit;
class QMainWindow;
class QSocketNotifier;
+class QSpinBox;
class QStackedLayout;
class QStatusBar;
class QString;
Modified: branches/S3_0/client/gui-qt/fonts.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/fonts.h?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/fonts.h (original)
+++ branches/S3_0/client/gui-qt/fonts.h Sat Jan 21 12:44:24 2017
@@ -15,12 +15,12 @@
#define FC__FONTS_H
// Qt
-#include <QFont>
#include <QMap>
-#include <QObject>
// gui-qt
#include "listener.h"
+
+class QFont;
namespace fonts
{
Modified: branches/S3_0/client/gui-qt/hudwidget.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/hudwidget.cpp?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/hudwidget.cpp (original)
+++ branches/S3_0/client/gui-qt/hudwidget.cpp Sat Jan 21 12:44:24 2017
@@ -21,6 +21,7 @@
#include <QComboBox>
#include <QDialogButtonBox>
#include <QGridLayout>
+#include <QGroupBox>
#include <QHBoxLayout>
#include <QHeaderView>
#include <QLineEdit>
Modified: branches/S3_0/client/gui-qt/mapview.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/mapview.h?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/mapview.h (original)
+++ branches/S3_0/client/gui-qt/mapview.h Sat Jan 21 12:44:24 2017
@@ -30,18 +30,15 @@
#include "fonts.h"
// Qt
-#include <QHBoxLayout>
+#include <QFrame>
#include <QLabel>
#include <QMutex>
-#include <QObject>
-#include <QPushButton>
#include <QQueue>
#include <QThread>
#include <QTimer>
-#include <QVariant>
-#include <QWidget>
// Forward declarations
+class QMutex;
class QPixmap;
class minimap_view;
Modified: branches/S3_0/client/gui-qt/menu.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/menu.cpp?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/menu.cpp (original)
+++ branches/S3_0/client/gui-qt/menu.cpp Sat Jan 21 12:44:24 2017
@@ -23,6 +23,7 @@
#include <QScrollArea>
#include <QSignalMapper>
#include <QStandardPaths>
+#include <QVBoxLayout>
// utility
#include "string_vector.h"
Modified: branches/S3_0/client/gui-qt/messagewin.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/messagewin.cpp?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/messagewin.cpp (original)
+++ branches/S3_0/client/gui-qt/messagewin.cpp Sat Jan 21 12:44:24 2017
@@ -17,6 +17,7 @@
// Qt
#include <QApplication>
+#include <QGridLayout>
#include <QHeaderView>
#include <QMouseEvent>
#include <QPainter>
Modified: branches/S3_0/client/gui-qt/messagewin.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/messagewin.h?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/messagewin.h (original)
+++ branches/S3_0/client/gui-qt/messagewin.h Sat Jan 21 12:44:24 2017
@@ -23,14 +23,18 @@
}
//Qt
-#include <QTableWidget>
-#include <QGridLayout>
-#include <QPushButton>
+#include <QWidget>
//qt-client
#include "chatline.h"
#include "mapview.h"
+class QEvent;
+class QGridLayout;
+class QItemSelection;
+class QMouseEvent;
+class QPixmap;
+class QTableWidget;
/***************************************************************************
Class representing message output
Modified: branches/S3_0/client/gui-qt/optiondlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/optiondlg.cpp?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/optiondlg.cpp (original)
+++ branches/S3_0/client/gui-qt/optiondlg.cpp Sat Jan 21 12:44:24 2017
@@ -20,7 +20,9 @@
#include <QCheckBox>
#include <QColorDialog>
#include <QComboBox>
+#include <QDialogButtonBox>
#include <QFontDialog>
+#include <QGroupBox>
#include <QHBoxLayout>
#include <QLabel>
#include <QLineEdit>
Modified: branches/S3_0/client/gui-qt/pages.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/pages.cpp?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/pages.cpp (original)
+++ branches/S3_0/client/gui-qt/pages.cpp Sat Jan 21 12:44:24 2017
@@ -18,8 +18,10 @@
// Qt
#include <QAction>
#include <QApplication>
+#include <QCheckBox>
#include <QDateTime>
#include <QFileDialog>
+#include <QGridLayout>
#include <QHeaderView>
#include <QLineEdit>
#include <QPainter>
Modified: branches/S3_0/client/gui-qt/plrdlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/plrdlg.cpp?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/plrdlg.cpp (original)
+++ branches/S3_0/client/gui-qt/plrdlg.cpp Sat Jan 21 12:44:24 2017
@@ -17,12 +17,14 @@
// Qt
#include <QApplication>
+#include <QHBoxLayout>
#include <QHeaderView>
#include <QMouseEvent>
#include <QPainter>
#include <QPushButton>
#include <QSortFilterProxyModel>
#include <QSplitter>
+#include <QVBoxLayout>
// gui-qt
#include "fc_client.h"
Modified: branches/S3_0/client/gui-qt/ratesdlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/ratesdlg.cpp?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/ratesdlg.cpp (original)
+++ branches/S3_0/client/gui-qt/ratesdlg.cpp Sat Jan 21 12:44:24 2017
@@ -18,10 +18,12 @@
// Qt
#include <QApplication>
#include <QDesktopWidget>
+#include <QGroupBox>
#include <QMouseEvent>
#include <QPainter>
-
-// client
+#include <QVBoxLayout>
+
+// common
#include "multipliers.h"
// gui-qt
Modified: branches/S3_0/client/gui-qt/ratesdlg.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/ratesdlg.h?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/ratesdlg.h (original)
+++ branches/S3_0/client/gui-qt/ratesdlg.h Sat Jan 21 12:44:24 2017
@@ -22,16 +22,8 @@
#endif
// Qt
-#include <QLabel>
-#include <QCheckBox>
-#include <QSlider>
#include <QDialog>
-#include <QPushButton>
-#include <QDialogButtonBox>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QString>
-#include <QGroupBox>
+# include <QList>
// common
#include "government.h"
@@ -42,7 +34,13 @@
extern "C" {
#include "ratesdlg_g.h"
}
+
+class QMouseEvent;
+class QPaintEvent;
class QPixmap;
+class QPushButton;
+class QSize;
+class QSlider;
/**************************************************************************
* Custom slider with two settable values
Modified: branches/S3_0/client/gui-qt/shortcuts.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/shortcuts.h?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/shortcuts.h (original)
+++ branches/S3_0/client/gui-qt/shortcuts.h Sat Jan 21 12:44:24 2017
@@ -15,13 +15,13 @@
#define FC__SHORTCUTSDLG_H
#include <QDialog>
+#include <QLineEdit>
#include <QPushButton>
-#include <QLineEdit>
+class QDialogButtonBox;
+class QSignalMapper;
class QVBoxLayout;
struct fc_shortcut;
-class QDialogButtonBox;
-class QSignalMapper;
void popup_shortcuts_dialog();
QString shortcut_to_string(fc_shortcut *sc);
Modified: branches/S3_0/client/gui-qt/spaceshipdlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/spaceshipdlg.cpp?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/spaceshipdlg.cpp (original)
+++ branches/S3_0/client/gui-qt/spaceshipdlg.cpp Sat Jan 21 12:44:24 2017
@@ -16,6 +16,7 @@
#endif
// Qt
+#include <QGridLayout>
#include <QLabel>
// common
Modified: branches/S3_0/client/gui-qt/voteinfo_bar.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/voteinfo_bar.cpp?rev=34879&r1=34878&r2=34879&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/voteinfo_bar.cpp (original)
+++ branches/S3_0/client/gui-qt/voteinfo_bar.cpp Sat Jan 21 12:44:24 2017
@@ -16,6 +16,7 @@
#endif
// Qt
+#include <QGridLayout>
#include <QPainter>
// client
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
