From ee40afb3285932c602ed774c251c39131fd00ed6 Mon Sep 17 00:00:00 2001
From: Hualet Wang <mr.asianwang@gmail.com>
Date: Mon, 6 Jul 2015 19:58:21 +0800
Subject: [PATCH] change DockModeData::getInstants to instance()

---
 dde-dock/src/Controller/dockmodedata.cpp | 2 +-
 dde-dock/src/Controller/dockmodedata.h   | 2 +-
 dde-dock/src/Panel/panel.h               | 2 +-
 dde-dock/src/Panel/panelmenu.h           | 2 +-
 dde-dock/src/Widgets/appicon.h           | 2 +-
 dde-dock/src/Widgets/appitem.h           | 2 +-
 dde-dock/src/mainwidget.cpp              | 6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dde-dock/src/Controller/dockmodedata.cpp b/dde-dock/src/Controller/dockmodedata.cpp
index 9bee6cb57..fce061a3b 100644
--- a/dde-dock/src/Controller/dockmodedata.cpp
+++ b/dde-dock/src/Controller/dockmodedata.cpp
@@ -6,7 +6,7 @@ DockModeData::DockModeData(QObject *parent) :
 }
 
 DockModeData * DockModeData::dockModeData = NULL;
-DockModeData * DockModeData::getInstants()
+DockModeData * DockModeData::instance()
 {
     if (dockModeData == NULL)
         dockModeData = new DockModeData();
diff --git a/dde-dock/src/Controller/dockmodedata.h b/dde-dock/src/Controller/dockmodedata.h
index 70ef7c0e0..e58548be5 100644
--- a/dde-dock/src/Controller/dockmodedata.h
+++ b/dde-dock/src/Controller/dockmodedata.h
@@ -9,7 +9,7 @@ class DockModeData : public QObject
 {
     Q_OBJECT
 public:
-    static DockModeData * getInstants();
+    static DockModeData * instance();
 
     Dock::DockMode getDockMode();
     void setDockMode(Dock::DockMode value);
diff --git a/dde-dock/src/Panel/panel.h b/dde-dock/src/Panel/panel.h
index b039898a3..696651099 100644
--- a/dde-dock/src/Panel/panel.h
+++ b/dde-dock/src/Panel/panel.h
@@ -55,7 +55,7 @@ private:
     AppManager *m_appManager = NULL;
     QWidget * parentWidget = NULL;
     ScreenMask * maskWidget = NULL;
-    DockModeData *dockCons = DockModeData::getInstants();
+    DockModeData *dockCons = DockModeData::instance();
     PanelMenu *panelMenu = NULL;
 };
 
diff --git a/dde-dock/src/Panel/panelmenu.h b/dde-dock/src/Panel/panelmenu.h
index 84b2442da..a7a030e4c 100644
--- a/dde-dock/src/Panel/panelmenu.h
+++ b/dde-dock/src/Panel/panelmenu.h
@@ -35,7 +35,7 @@ private slots:
     void changeToClassicMode();
 
 private:
-    DockModeData *dockCons = DockModeData::getInstants();
+    DockModeData *dockCons = DockModeData::instance();
 
     const int MENU_ITEM_HEIGHT = 30;
     const int MENU_ITEM_SPACING = 3;
diff --git a/dde-dock/src/Widgets/appicon.h b/dde-dock/src/Widgets/appicon.h
index 6602a5ec5..4c971ed8c 100644
--- a/dde-dock/src/Widgets/appicon.h
+++ b/dde-dock/src/Widgets/appicon.h
@@ -22,7 +22,7 @@ public slots:
 
     QString getSysIcon(const QString &iconName, int size = 48);
 private:
-    DockModeData *m_modeData = DockModeData::getInstants();
+    DockModeData *m_modeData = DockModeData::instance();
 };
 
 #endif // APPICON_H
diff --git a/dde-dock/src/Widgets/appitem.h b/dde-dock/src/Widgets/appitem.h
index 0d3ba5ce2..2fd61727e 100644
--- a/dde-dock/src/Widgets/appitem.h
+++ b/dde-dock/src/Widgets/appitem.h
@@ -85,7 +85,7 @@ private:
 
 private:
     AppItemData m_itemData;
-    DockModeData *dockCons = DockModeData::getInstants();
+    DockModeData *dockCons = DockModeData::instance();
     DBusEntryProxyer *m_entryProxyer = NULL;
     DBusClientManager *m_clientmanager = NULL;
     AppBackground * appBackground = NULL;
diff --git a/dde-dock/src/mainwidget.cpp b/dde-dock/src/mainwidget.cpp
index cb0143e67..50ef363b5 100644
--- a/dde-dock/src/mainwidget.cpp
+++ b/dde-dock/src/mainwidget.cpp
@@ -4,7 +4,7 @@ MainWidget::MainWidget(QWidget *parent)
     : QWidget(parent)
 {
     QRect rec = QApplication::desktop()->screenGeometry();
-    this->resize(rec.width(),DockModeData::getInstants()->getDockHeight());
+    this->resize(rec.width(),DockModeData::instance()->getDockHeight());
     mainPanel = new Panel(this);
     mainPanel->resize(this->width(),this->height());
     mainPanel->move(0,0);
@@ -13,14 +13,14 @@ MainWidget::MainWidget(QWidget *parent)
     this->setAttribute(Qt::WA_TranslucentBackground);
     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)));
 }
 
 void MainWidget::slotDockModeChanged(Dock::DockMode newMode, Dock::DockMode oldMode)
 {
     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->move(0,0);