aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@qt.io>2016-11-22 14:42:05 +0900
committerTasuku Suzuki <tasuku.suzuki@qt.io>2016-11-22 14:42:12 +0900
commitffad9fd5bed339b7ae3bd8086f1c90ce1b6dc69b (patch)
treedd41984b02d002976d94f4237657b2474a1656e5
parentd726a91974d959a5765ab7d3b3c939132febd2e5 (diff)
fix typo
Change-Id: I11b6b535c2587c5e61dfb17c8cb56f2554e06c06 Signed-off-by: Tasuku Suzuki <tasuku.suzuki@qt.io>
-rw-r--r--HomeScreen/src/homescreencontrolinterface.h4
-rw-r--r--HomeScreen/src/mainwindow.h4
-rw-r--r--HomeScreen/src/popupwidget.h4
-rw-r--r--HomeScreen/src/statusbarwidget.h4
-rw-r--r--HomeScreenAppFrameworkBinderAGL/src/homescreenappframeworkbinderagl.h4
-rw-r--r--HomeScreenAppFrameworkBinderTizen/src/homescreenappframeworkbindertizen.h4
-rw-r--r--HomeScreenSimulator/src/mainwindow.cpp8
-rw-r--r--HomeScreenSimulator/src/mainwindow.h4
-rw-r--r--InputEventManager/src/inputeventmanager.h4
-rw-r--r--WindowManager/src/windowmanager.hpp4
-rw-r--r--interfaces/interfaces.pro26
11 files changed, 35 insertions, 35 deletions
diff --git a/HomeScreen/src/homescreencontrolinterface.h b/HomeScreen/src/homescreencontrolinterface.h
index 04e47cb..39652f1 100644
--- a/HomeScreen/src/homescreencontrolinterface.h
+++ b/HomeScreen/src/homescreencontrolinterface.h
@@ -3,7 +3,7 @@
#include <QObject>
#include "include/homescreen.hpp"
-#include "homescreen_adapter.h"
+#include "homescreen_adaptor.h"
#include <include/appframework.hpp>
#include <appframework_proxy.h>
@@ -23,7 +23,7 @@ signals:
bool newRequestRenderSurfaceToAreaAllowed(int surfaceId, int layoutArea);
void newRequestSurfaceIdToFullScreen(int surfaceId);
-//from homescreen_adapter.h
+//from homescreen_adaptor.h
public Q_SLOTS: // METHODS
QList<int> getAllSurfacesOfProcess(int pid);
int getSurfaceStatus(int surfaceId);
diff --git a/HomeScreen/src/mainwindow.h b/HomeScreen/src/mainwindow.h
index 4b41761..28471a0 100644
--- a/HomeScreen/src/mainwindow.h
+++ b/HomeScreen/src/mainwindow.h
@@ -19,7 +19,7 @@
#include <QMainWindow>
#include "daynightmode_proxy.h"
-#include "proximity_adapter.h"
+#include "proximity_adaptor.h"
#include "homescreencontrolinterface.h"
@@ -48,7 +48,7 @@ public:
public Q_SLOTS:
void dayNightModeSlot(int mode);
-// from proximity_adapter.h
+// from proximity_adaptor.h
public Q_SLOTS:
void setObjectDetected(bool detected);
diff --git a/HomeScreen/src/popupwidget.h b/HomeScreen/src/popupwidget.h
index eaf41de..97db3ba 100644
--- a/HomeScreen/src/popupwidget.h
+++ b/HomeScreen/src/popupwidget.h
@@ -19,7 +19,7 @@
#include <QWidget>
#include <include/popup.hpp>
-#include "popup_adapter.h"
+#include "popup_adaptor.h"
namespace Ui {
class PopupWidget;
@@ -35,7 +35,7 @@ public:
public slots:
void updateColorScheme();
- // from popup_adapter.h
+ // from popup_adaptor.h
public Q_SLOTS: // METHODS
void showPopup(int /*type*/, const QString &text);
void showPopupComboBox(const QString &text, const QStringList &choices);
diff --git a/HomeScreen/src/statusbarwidget.h b/HomeScreen/src/statusbarwidget.h
index 29c236d..cac856d 100644
--- a/HomeScreen/src/statusbarwidget.h
+++ b/HomeScreen/src/statusbarwidget.h
@@ -18,7 +18,7 @@
#define STATUSBARWIDGET_H
#include <QWidget>
-#include "statusbar_adapter.h"
+#include "statusbar_adaptor.h"
namespace Ui {
class StatusBarWidget;
@@ -34,7 +34,7 @@ public:
public slots:
void updateColorScheme();
-// from statusbar_adapter.h
+// from statusbar_adaptor.h
public Q_SLOTS: // METHODS
QList<int> getAvailablePlaceholders();
QString getStatusIcon(int placeholderIndex);
diff --git a/HomeScreenAppFrameworkBinderAGL/src/homescreenappframeworkbinderagl.h b/HomeScreenAppFrameworkBinderAGL/src/homescreenappframeworkbinderagl.h
index d1d88ce..62e7fcb 100644
--- a/HomeScreenAppFrameworkBinderAGL/src/homescreenappframeworkbinderagl.h
+++ b/HomeScreenAppFrameworkBinderAGL/src/homescreenappframeworkbinderagl.h
@@ -19,7 +19,7 @@
#include <QObject>
#include <include/appframework.hpp>
-#include "appframework_adapter.h"
+#include "appframework_adaptor.h"
#include "afm_user_daemon_proxy.h"
@@ -33,7 +33,7 @@ private:
AppframeworkAdaptor *mp_appframeworkAdaptor;
QList<AppInfo> m_apps;
- //from appframework_adapter.h
+ //from appframework_adaptor.h
public Q_SLOTS: // METHODS
QList<AppInfo> getAvailableApps();
int launchApp(const QString &name);
diff --git a/HomeScreenAppFrameworkBinderTizen/src/homescreenappframeworkbindertizen.h b/HomeScreenAppFrameworkBinderTizen/src/homescreenappframeworkbindertizen.h
index 1d48f7a..f13be9a 100644
--- a/HomeScreenAppFrameworkBinderTizen/src/homescreenappframeworkbindertizen.h
+++ b/HomeScreenAppFrameworkBinderTizen/src/homescreenappframeworkbindertizen.h
@@ -19,7 +19,7 @@
#include <QObject>
#include <include/appframework.hpp>
-#include "appframework_adapter.h"
+#include "appframework_adaptor.h"
#ifdef __arm__
extern "C" {
@@ -38,7 +38,7 @@ private:
AppframeworkAdaptor *mp_appframeworkAdaptor;
QList<AppInfo> m_apps;
- //from appframework_adapter.h
+ //from appframework_adaptor.h
public Q_SLOTS: // METHODS
QStringList getAvailableAppNames();
int launchApp(const QString &name);
diff --git a/HomeScreenSimulator/src/mainwindow.cpp b/HomeScreenSimulator/src/mainwindow.cpp
index 6c0dc2f..5bb1487 100644
--- a/HomeScreenSimulator/src/mainwindow.cpp
+++ b/HomeScreenSimulator/src/mainwindow.cpp
@@ -20,7 +20,7 @@
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
mp_ui(new Ui::MainWindow),
- mp_dBusDayNightModeAdapter(0),
+ mp_dBusDayNightModeAdaptor(0),
mp_dBusStatusBarProxy(0),
mp_dBusPopupProxy(0),
mp_dBusProximityProxy(0),
@@ -32,7 +32,7 @@ MainWindow::MainWindow(QWidget *parent) :
QDBusConnection dbus = QDBusConnection::sessionBus();
// publish dbus day night mode interface
- mp_dBusDayNightModeAdapter = new DaynightmodeAdaptor((QObject*)this);
+ mp_dBusDayNightModeAdaptor = new DaynightmodeAdaptor((QObject*)this);
dbus.registerService("org.agl.homescreen.simulator");
dbus.registerObject("/", this);
@@ -72,9 +72,9 @@ MainWindow::~MainWindow()
delete mp_dBusPopupProxy;
delete mp_dBusStatusBarProxy;
- if (0 == mp_dBusDayNightModeAdapter)
+ if (0 == mp_dBusDayNightModeAdaptor)
{
- delete mp_dBusDayNightModeAdapter;
+ delete mp_dBusDayNightModeAdaptor;
}
delete mp_ui;
}
diff --git a/HomeScreenSimulator/src/mainwindow.h b/HomeScreenSimulator/src/mainwindow.h
index 3b1855c..cf43002 100644
--- a/HomeScreenSimulator/src/mainwindow.h
+++ b/HomeScreenSimulator/src/mainwindow.h
@@ -19,7 +19,7 @@
#include <QMainWindow>
#include <include/daynightmode.hpp>
-#include "daynightmode_adapter.h"
+#include "daynightmode_adaptor.h"
#include "statusbar_proxy.h"
#include "popup_proxy.h"
@@ -65,7 +65,7 @@ private slots:
private:
Ui::MainWindow *mp_ui;
- DaynightmodeAdaptor *mp_dBusDayNightModeAdapter;
+ DaynightmodeAdaptor *mp_dBusDayNightModeAdaptor;
org::agl::statusbar *mp_dBusStatusBarProxy;
org::agl::popup *mp_dBusPopupProxy;
org::agl::proximity *mp_dBusProximityProxy;
diff --git a/InputEventManager/src/inputeventmanager.h b/InputEventManager/src/inputeventmanager.h
index 6bbf442..075895c 100644
--- a/InputEventManager/src/inputeventmanager.h
+++ b/InputEventManager/src/inputeventmanager.h
@@ -17,7 +17,7 @@
#ifndef INPUTEVENTMANAGER_H
#define INPUTEVENTMANAGER_H
-#include "inputevent_adapter.h"
+#include "inputevent_adaptor.h"
#include <include/homescreen.hpp>
#include "homescreen_proxy.h"
@@ -40,7 +40,7 @@ private:
InputeventAdaptor *mp_inputEventAdaptor;
org::agl::homescreen *mp_dBusHomeScreenProxy;
- //from inputevent_adapter.h
+ //from inputevent_adaptor.h
public Q_SLOTS: // METHODS
void hardKeyPressed(int key);
diff --git a/WindowManager/src/windowmanager.hpp b/WindowManager/src/windowmanager.hpp
index 30affd6..26fe8ea 100644
--- a/WindowManager/src/windowmanager.hpp
+++ b/WindowManager/src/windowmanager.hpp
@@ -21,7 +21,7 @@
#include <QList>
#include <QMap>
-#include "windowmanager_adapter.h"
+#include "windowmanager_adaptor.h"
#ifdef HAVE_IVI_LAYERMANAGEMENT_API
@@ -82,7 +82,7 @@ public:
public slots:
-// from windowmanager_adapter.h
+// from windowmanager_adaptor.h
public: // PROPERTIES
Q_PROPERTY(int layoutId READ layoutId)
int layoutId() const;
diff --git a/interfaces/interfaces.pro b/interfaces/interfaces.pro
index 61085bf..fe23f6c 100644
--- a/interfaces/interfaces.pro
+++ b/interfaces/interfaces.pro
@@ -35,13 +35,13 @@ XMLSOURCES = \
statusbar.xml \
windowmanager.xml
-gen_adapter_cpp.input = XMLSOURCES
-gen_adapter_cpp.commands = \
- qdbusxml2cpp -i include/${QMAKE_FILE_IN_BASE}.hpp -m -a ${QMAKE_FILE_IN_BASE}_adapter ${QMAKE_FILE_IN}; \
- moc $$OUT_PWD/${QMAKE_FILE_IN_BASE}_adapter.h -o $$OUT_PWD/${QMAKE_FILE_IN_BASE}_adapter.moc
-gen_adapter_cpp.output = ${QMAKE_FILE_IN_BASE}_adapter.cpp
-gen_adapter_cpp.variable_out = SOURCES
-gen_adapter_cpp.clean = ${QMAKE_FILE_IN_BASE}_adapter.cpp
+gen_adaptor_cpp.input = XMLSOURCES
+gen_adaptor_cpp.commands = \
+ qdbusxml2cpp -i include/${QMAKE_FILE_IN_BASE}.hpp -m -a ${QMAKE_FILE_IN_BASE}_adaptor ${QMAKE_FILE_IN}; \
+ moc $$OUT_PWD/${QMAKE_FILE_IN_BASE}_adaptor.h -o $$OUT_PWD/${QMAKE_FILE_IN_BASE}_adaptor.moc
+gen_adaptor_cpp.output = ${QMAKE_FILE_IN_BASE}_adaptor.cpp
+gen_adaptor_cpp.variable_out = SOURCES
+gen_adaptor_cpp.clean = ${QMAKE_FILE_IN_BASE}_adaptor.cpp
gen_proxy_cpp.input = XMLSOURCES
gen_proxy_cpp.commands = \
@@ -51,11 +51,11 @@ gen_proxy_cpp.output = ${QMAKE_FILE_IN_BASE}_proxy.cpp
gen_proxy_cpp.variable_out = SOURCES
gen_proxy_cpp.clean = ${QMAKE_FILE_IN_BASE}_proxy.cpp
-gen_adapter_h.input = XMLSOURCES
-gen_adapter_h.commands = @echo Fake making the header for ${QMAKE_FILE_IN}
-gen_adapter_h.depends = ${QMAKE_FILE_IN_BASE}_adapter.cpp
-gen_adapter_h.output = ${QMAKE_FILE_IN_BASE}_adapter.h
-gen_adapter_h.clean = ${QMAKE_FILE_IN_BASE}_adapter.h
+gen_adaptor_h.input = XMLSOURCES
+gen_adaptor_h.commands = @echo Fake making the header for ${QMAKE_FILE_IN}
+gen_adaptor_h.depends = ${QMAKE_FILE_IN_BASE}_adaptor.cpp
+gen_adaptor_h.output = ${QMAKE_FILE_IN_BASE}_adaptor.h
+gen_adaptor_h.clean = ${QMAKE_FILE_IN_BASE}_adaptor.h
gen_proxy_h.input = XMLSOURCES
gen_proxy_h.commands = @echo Fake making the header for ${QMAKE_FILE_IN}
@@ -63,4 +63,4 @@ gen_proxy_h.depends = ${QMAKE_FILE_IN_BASE}_proxy.cpp
gen_proxy_h.output = ${QMAKE_FILE_IN_BASE}_proxy.h
gen_proxy_h.clean = ${QMAKE_FILE_IN_BASE}_proxy.h
-QMAKE_EXTRA_COMPILERS += gen_adapter_cpp gen_proxy_cpp gen_adapter_h gen_proxy_h
+QMAKE_EXTRA_COMPILERS += gen_adaptor_cpp gen_proxy_cpp gen_adaptor_h gen_proxy_h