summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-08-06 14:25:09 (GMT)
committeraxis <qt-info@nokia.com>2009-08-06 16:00:25 (GMT)
commit36fce9a00b9efbf9c7834454825c275c4bb53820 (patch)
treeb8784f66d9be3c680df02360a324cfd54a9c9d2a
parent451b9c10c42b5488178d7b165c0c9c90321a232a (diff)
downloadQt-36fce9a00b9efbf9c7834454825c275c4bb53820.zip
Qt-36fce9a00b9efbf9c7834454825c275c4bb53820.tar.gz
Qt-36fce9a00b9efbf9c7834454825c275c4bb53820.tar.bz2
Made the static wrapper app headers private.
Even though the static app is public in the sense that it is included in every program, the headers it contains are not. RevBy: Jason Barron AutoTest: tst_headers passed
-rw-r--r--src/s60main/qts60main.cpp2
-rw-r--r--src/s60main/qts60mainapplication.cpp4
-rw-r--r--src/s60main/qts60mainapplication_p.h (renamed from src/s60main/qts60mainapplication.h)11
-rw-r--r--src/s60main/qts60mainappui.cpp2
-rw-r--r--src/s60main/qts60mainappui_p.h (renamed from src/s60main/qts60mainappui.h)11
-rw-r--r--src/s60main/qts60maindocument.cpp4
-rw-r--r--src/s60main/qts60maindocument_p.h (renamed from src/s60main/qts60maindocument.h)11
-rw-r--r--src/s60main/s60main.pro6
8 files changed, 42 insertions, 9 deletions
diff --git a/src/s60main/qts60main.cpp b/src/s60main/qts60main.cpp
index 6690878..e3ab46d 100644
--- a/src/s60main/qts60main.cpp
+++ b/src/s60main/qts60main.cpp
@@ -42,7 +42,7 @@
// INCLUDE FILES
#include <exception>
#include <eikstart.h>
-#include "qts60mainapplication.h"
+#include "qts60mainapplication_p.h"
/**
* factory function to create the QtS60Main application class
diff --git a/src/s60main/qts60mainapplication.cpp b/src/s60main/qts60mainapplication.cpp
index 1e94af4..52b15d6 100644
--- a/src/s60main/qts60mainapplication.cpp
+++ b/src/s60main/qts60mainapplication.cpp
@@ -41,8 +41,8 @@
// INCLUDE FILES
#include <exception>
-#include "qts60maindocument.h"
-#include "qts60mainapplication.h"
+#include "qts60maindocument_p.h"
+#include "qts60mainapplication_p.h"
#include <bautils.h>
#include <coemain.h>
diff --git a/src/s60main/qts60mainapplication.h b/src/s60main/qts60mainapplication_p.h
index 3014e81..b35b38e 100644
--- a/src/s60main/qts60mainapplication.h
+++ b/src/s60main/qts60mainapplication_p.h
@@ -42,6 +42,17 @@
#ifndef __QtS60MainAPPLICATION_H__
#define __QtS60MainAPPLICATION_H__
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
// INCLUDES
#include <aknapp.h>
diff --git a/src/s60main/qts60mainappui.cpp b/src/s60main/qts60mainappui.cpp
index 73a47c5..4567350 100644
--- a/src/s60main/qts60mainappui.cpp
+++ b/src/s60main/qts60mainappui.cpp
@@ -48,7 +48,7 @@
#include <s60main.rsg>
#include <avkon.rsg>
-#include "qts60mainappui.h"
+#include "qts60mainappui_p.h"
#include <QtGui/qapplication.h>
#include <QtGui/qmenu.h>
#include <QtGui/private/qt_s60_p.h>
diff --git a/src/s60main/qts60mainappui.h b/src/s60main/qts60mainappui_p.h
index bea6406..943d61d 100644
--- a/src/s60main/qts60mainappui.h
+++ b/src/s60main/qts60mainappui_p.h
@@ -42,6 +42,17 @@
#ifndef __QtS60MainAPPUI_H__
#define __QtS60MainAPPUI_H__
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
// INCLUDES
#include <aknappui.h>
diff --git a/src/s60main/qts60maindocument.cpp b/src/s60main/qts60maindocument.cpp
index 4ba91e1..1fd3e3e 100644
--- a/src/s60main/qts60maindocument.cpp
+++ b/src/s60main/qts60maindocument.cpp
@@ -41,8 +41,8 @@
// INCLUDE FILES
#include <exception>
-#include "qts60mainappui.h"
-#include "qts60maindocument.h"
+#include "qts60mainappui_p.h"
+#include "qts60maindocument_p.h"
// ============================ MEMBER FUNCTIONS ===============================
diff --git a/src/s60main/qts60maindocument.h b/src/s60main/qts60maindocument_p.h
index dcec8ec..a7e1fd2 100644
--- a/src/s60main/qts60maindocument.h
+++ b/src/s60main/qts60maindocument_p.h
@@ -42,6 +42,17 @@
#ifndef __QTS60MAINDOCUMENT_H__
#define __QTS60MAINDOCUMENT_H__
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
// INCLUDES
#include <akndoc.h>
diff --git a/src/s60main/s60main.pro b/src/s60main/s60main.pro
index 57c9949..a4833af 100644
--- a/src/s60main/s60main.pro
+++ b/src/s60main/s60main.pro
@@ -18,9 +18,9 @@ symbian {
qts60mainappui.cpp \
qts60maindocument.cpp
- HEADERS = qts60mainapplication.h \
- qts60mainappui.h \
- qts60maindocument.h
+ HEADERS = qts60mainapplication_p.h \
+ qts60mainappui_p.h \
+ qts60maindocument_p.h
# This block serves the minimalistic resource file for S60 3.1 platforms.
# Note there is no way to ifdef S60 version in mmp file, that is why the resource