Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

change DockModeData::getInstants to instance()

Browse Source
This commit is contained in:
Hualet Wang 2015-07-06 19:58:21 +08:00
parent 12e14d9d57
commit ee40afb328
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dde-dock/src/Controller/dockmodedata.cpp
View File

@ -6,7 +6,7 @@ DockModeData::DockModeData(QObject *parent) :
} }
DockModeData * DockModeData::dockModeData = NULL; DockModeData * DockModeData::dockModeData = NULL;
DockModeData * DockModeData::getInstants() DockModeData * DockModeData::instance()
{ {
if (dockModeData == NULL) if (dockModeData == NULL)
dockModeData = new DockModeData(); dockModeData = new DockModeData();

2
dde-dock/src/Controller/dockmodedata.h
View File

@ -9,7 +9,7 @@ class DockModeData : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
static DockModeData * getInstants(); static DockModeData * instance();
Dock::DockMode getDockMode(); Dock::DockMode getDockMode();
void setDockMode(Dock::DockMode value); void setDockMode(Dock::DockMode value);

2
dde-dock/src/Panel/panel.h
View File

@ -55,7 +55,7 @@ private:
AppManager *m_appManager = NULL; AppManager *m_appManager = NULL;
QWidget * parentWidget = NULL; QWidget * parentWidget = NULL;
ScreenMask * maskWidget = NULL; ScreenMask * maskWidget = NULL;
DockModeData *dockCons = DockModeData::getInstants(); DockModeData *dockCons = DockModeData::instance();
PanelMenu *panelMenu = NULL; PanelMenu *panelMenu = NULL;
}; };

2
dde-dock/src/Panel/panelmenu.h
View File

@ -35,7 +35,7 @@ private slots:
void changeToClassicMode(); void changeToClassicMode();
private: private:
DockModeData *dockCons = DockModeData::getInstants(); DockModeData *dockCons = DockModeData::instance();
const int MENU_ITEM_HEIGHT = 30; const int MENU_ITEM_HEIGHT = 30;
const int MENU_ITEM_SPACING = 3; const int MENU_ITEM_SPACING = 3;

2
dde-dock/src/Widgets/appicon.h
View File

@ -22,7 +22,7 @@ public slots:
QString getSysIcon(const QString &iconName, int size = 48); QString getSysIcon(const QString &iconName, int size = 48);
private: private:
DockModeData *m_modeData = DockModeData::getInstants(); DockModeData *m_modeData = DockModeData::instance();
}; };
#endif // APPICON_H #endif // APPICON_H

2
dde-dock/src/Widgets/appitem.h
View File

@ -85,7 +85,7 @@ private:
private: private:
AppItemData m_itemData; AppItemData m_itemData;
DockModeData *dockCons = DockModeData::getInstants(); DockModeData *dockCons = DockModeData::instance();
DBusEntryProxyer *m_entryProxyer = NULL; DBusEntryProxyer *m_entryProxyer = NULL;
DBusClientManager *m_clientmanager = NULL; DBusClientManager *m_clientmanager = NULL;
AppBackground * appBackground = NULL; AppBackground * appBackground = NULL;

6
dde-dock/src/mainwidget.cpp
View File

@ -4,7 +4,7 @@ MainWidget::MainWidget(QWidget *parent)
: QWidget(parent) : QWidget(parent)
{ {
QRect rec = QApplication::desktop()->screenGeometry(); QRect rec = QApplication::desktop()->screenGeometry();
this->resize(rec.width(),DockModeData::getInstants()->getDockHeight()); this->resize(rec.width(),DockModeData::instance()->getDockHeight());
mainPanel = new Panel(this); mainPanel = new Panel(this);
mainPanel->resize(this->width(),this->height()); mainPanel->resize(this->width(),this->height());
mainPanel->move(0,0); mainPanel->move(0,0);
@ -13,14 +13,14 @@ MainWidget::MainWidget(QWidget *parent)
this->setAttribute(Qt::WA_TranslucentBackground); this->setAttribute(Qt::WA_TranslucentBackground);
this->move(0,rec.height()); this->move(0,rec.height());
connect(DockModeData::getInstants(), SIGNAL(dockModeChanged(Dock::DockMode,Dock::DockMode)), connect(DockModeData::instance(), SIGNAL(dockModeChanged(Dock::DockMode,Dock::DockMode)),
this, SLOT(slotDockModeChanged(Dock::DockMode,Dock::DockMode))); this, SLOT(slotDockModeChanged(Dock::DockMode,Dock::DockMode)));
} }
void MainWidget::slotDockModeChanged(Dock::DockMode newMode, Dock::DockMode oldMode) void MainWidget::slotDockModeChanged(Dock::DockMode newMode, Dock::DockMode oldMode)
{ {
QRect rec = QApplication::desktop()->screenGeometry(); QRect rec = QApplication::desktop()->screenGeometry();
this->resize(rec.width(),DockModeData::getInstants()->getDockHeight()); this->resize(rec.width(),DockModeData::instance()->getDockHeight());
// mainPanel->resize(this->width(),this->height()); // mainPanel->resize(this->width(),this->height());
// mainPanel->move(0,0); // mainPanel->move(0,0);