use module-less include file style for the sdk example.

This was proposed by Kavindra and actually it is probably simpler for newbies. The documentation already talks about this style, so use it.
2009-08-07 15:03:29 +02:00
parent 2841e875b4
commit ef43fbf594
18 changed files with 35 additions and 38 deletions
--- a/doc/addressbook-sdk.qdoc
+++ b/doc/addressbook-sdk.qdoc
@@ -338,9 +338,6 @@
    Since the \c AddressBook class is a subclass of QWidget, Qt Creator
    includes QWidget in the header file.

-    ## this is a bit confusing, because QWidget is already included, but without QtGui/
-    ## Also, how about ordering the includes by module?
-
    \snippet examples/addressbook-sdk/part2/addressbook.h include

    We need a container to store our address book contacts, so that we can
--- a/doc/examples/addressbook-sdk/part1/addressbook.h
+++ b/doc/examples/addressbook-sdk/part1/addressbook.h
@@ -2,7 +2,7 @@
 #ifndef ADDRESSBOOK_H
 #define ADDRESSBOOK_H

-#include <QtGui/QWidget>
+#include <QWidget>

 namespace Ui
 {
--- a/doc/examples/addressbook-sdk/part1/main.cpp
+++ b/doc/examples/addressbook-sdk/part1/main.cpp
@@ -1,5 +1,5 @@
 //! [main function]
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "addressbook.h"

 int main(int argc, char *argv[])
--- a/doc/examples/addressbook-sdk/part2/addressbook.h
+++ b/doc/examples/addressbook-sdk/part2/addressbook.h
@@ -2,9 +2,9 @@
 #define ADDRESSBOOK_H

 //! [include]
-#include <QtGui/QWidget>
-#include <QtCore/QMap>
-#include <QtGui/QMessageBox>
+#include <QWidget>
+#include <QMap>
+#include <QMessageBox>
 //! [include]

 namespace Ui
--- a/doc/examples/addressbook-sdk/part2/main.cpp
+++ b/doc/examples/addressbook-sdk/part2/main.cpp
@@ -1,5 +1,5 @@
 //! [main function]
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "addressbook.h"

 int main(int argc, char *argv[])
--- a/doc/examples/addressbook-sdk/part3/addressbook.h
+++ b/doc/examples/addressbook-sdk/part3/addressbook.h
@@ -1,9 +1,9 @@
 #ifndef ADDRESSBOOK_H
 #define ADDRESSBOOK_H

-#include <QtGui/QWidget>
-#include <QtGui/QMessageBox>
-#include <QtCore/QMap>
+#include <QWidget>
+#include <QMessageBox>
+#include <QMap>

 namespace Ui
 {
--- a/doc/examples/addressbook-sdk/part3/main.cpp
+++ b/doc/examples/addressbook-sdk/part3/main.cpp
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "addressbook.h"

 int main(int argc, char *argv[])
--- a/doc/examples/addressbook-sdk/part4/addressbook.h
+++ b/doc/examples/addressbook-sdk/part4/addressbook.h
@@ -1,9 +1,9 @@
 #ifndef ADDRESSBOOK_H
 #define ADDRESSBOOK_H

-#include <QtGui/QWidget>
-#include <QtGui/QMessageBox>
-#include <QtCore/QMap>
+#include <QWidget>
+#include <QMessageBox>
+#include <QMap>


 namespace Ui
--- a/doc/examples/addressbook-sdk/part4/main.cpp
+++ b/doc/examples/addressbook-sdk/part4/main.cpp
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "addressbook.h"

 int main(int argc, char *argv[])
--- a/doc/examples/addressbook-sdk/part5/addressbook.h
+++ b/doc/examples/addressbook-sdk/part5/addressbook.h
@@ -1,9 +1,9 @@
 #ifndef ADDRESSBOOK_H
 #define ADDRESSBOOK_H

-#include <QtGui/QWidget>
-#include <QtGui/QMessageBox>
-#include <QtCore/QMap>
+#include <QWidget>
+#include <QMessageBox>
+#include <QMap>
 //! [include]
 #include "finddialog.h"
 //! [include]
--- a/doc/examples/addressbook-sdk/part5/finddialog.h
+++ b/doc/examples/addressbook-sdk/part5/finddialog.h
@@ -1,9 +1,9 @@
 #ifndef FINDDIALOG_H
 #define FINDDIALOG_H

-#include <QtGui/QDialog>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
+#include <QDialog>
+#include <QLineEdit>
+#include <QPushButton>

 namespace Ui {
    class FindDialog;
--- a/doc/examples/addressbook-sdk/part5/main.cpp
+++ b/doc/examples/addressbook-sdk/part5/main.cpp
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "addressbook.h"

 int main(int argc, char *argv[])
--- a/doc/examples/addressbook-sdk/part6/addressbook.h
+++ b/doc/examples/addressbook-sdk/part6/addressbook.h
@@ -1,9 +1,9 @@
 #ifndef ADDRESSBOOK_H
 #define ADDRESSBOOK_H

-#include <QtGui/QWidget>
-#include <QtGui/QMessageBox>
-#include <QtCore/QMap>
+#include <QWidget>
+#include <QMessageBox>
+#include <QMap>
 #include "finddialog.h"

 namespace Ui
--- a/doc/examples/addressbook-sdk/part6/finddialog.h
+++ b/doc/examples/addressbook-sdk/part6/finddialog.h
@@ -1,9 +1,9 @@
 #ifndef FINDDIALOG_H
 #define FINDDIALOG_H

-#include <QtGui/QDialog>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
+#include <QDialog>
+#include <QLineEdit>
+#include <QPushButton>

 namespace Ui {
    class FindDialog;
--- a/doc/examples/addressbook-sdk/part6/main.cpp
+++ b/doc/examples/addressbook-sdk/part6/main.cpp
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "addressbook.h"

 int main(int argc, char *argv[])
--- a/doc/examples/addressbook-sdk/part7/addressbook.h
+++ b/doc/examples/addressbook-sdk/part7/addressbook.h
@@ -1,9 +1,9 @@
 #ifndef ADDRESSBOOK_H
 #define ADDRESSBOOK_H

-#include <QtGui/QWidget>
-#include <QtGui/QMessageBox>
-#include <QtCore/QMap>
+#include <QWidget>
+#include <QMessageBox>
+#include <QMap>
 #include "finddialog.h"

 namespace Ui
--- a/doc/examples/addressbook-sdk/part7/finddialog.h
+++ b/doc/examples/addressbook-sdk/part7/finddialog.h
@@ -1,9 +1,9 @@
 #ifndef FINDDIALOG_H
 #define FINDDIALOG_H

-#include <QtGui/QDialog>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
+#include <QDialog>
+#include <QLineEdit>
+#include <QPushButton>

 namespace Ui {
    class FindDialog;
--- a/doc/examples/addressbook-sdk/part7/main.cpp
+++ b/doc/examples/addressbook-sdk/part7/main.cpp
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "addressbook.h"

 int main(int argc, char *argv[])