projects
/
fmit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import upstream version 0.99.2
[fmit.git]
/
src
/
modules
/
View.h
diff --git
a/src/modules/View.h
b/src/modules/View.h
index
94862a3
..
8db559a
100644
(file)
--- a/
src/modules/View.h
+++ b/
src/modules/View.h
@@
-23,25
+23,25
@@
#include <list>
using namespace std;
#include <qframe.h>
#include <list>
using namespace std;
#include <qframe.h>
-#include <qpopupmenu.h>
-#include <qsettings.h>
+#include <qmenu.h>
#include <qaction.h>
#include <qlabel.h>
#include <qaction.h>
#include <qlabel.h>
+#include "../AutoQSettings.h"
class View
{
static list<View*> s_views;
class View
{
static list<View*> s_views;
- protected:
+protected:
struct Title : QLabel
{
Title(const QString& text, QWidget* parent) : QLabel(text, parent)
struct Title : QLabel
{
Title(const QString& text, QWidget* parent) : QLabel(text, parent)
- {setAlignment(QLabel::AlignCenter);}
+ {setAlignment(Qt::AlignCenter);}
};
const QString m_name;
QWidget* m_parent;
};
const QString m_name;
QWidget* m_parent;
- QPopupMenu m_popup_menu;
+ QMenu m_popup_menu;
View(const QString& name, QWidget* parent);
virtual void mouseReleaseEvent(QMouseEvent* e);
View(const QString& name, QWidget* parent);
virtual void mouseReleaseEvent(QMouseEvent* e);
@@
-49,7
+49,7
@@
class View
virtual ~View() {}
public:
virtual ~View() {}
public:
- static QSettings* s_settings;
+ static AutoQSettings* s_settings;
const QString& getName() {return m_name;}
int getNbView() const {return s_views.size();}
const QString& getName() {return m_name;}
int getNbView() const {return s_views.size();}