Changeset 846 for trunk/demos/qtdemo/menumanager.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/qtdemo/menumanager.h (modified) (6 diffs)

trunk/demos/qtdemo/menumanager.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -46 +46 @@
 #include <QtXml>
 #include <QtHelp/QHelpEngineCore>
+
+
+
 
 #include "score.h"
@@ -62 +65 @@
 
 public:
-    enum BUTTON_TYPE {ROOT, MENU1, MENU2, LAUNCH, DOCUMENTATION, QUIT, FULLSCREEN, UP, DOWN, BACK};
+    enum BUTTON_TYPE {ROOT, MENU1, MENU2, LAUNCH, DOCUMENTATION, QUIT, FULLSCREEN, UP, DOWN, BACK};
 
     // singleton pattern:
@@ -84 +87 @@
     int currentMenuCode;
 
+
+
+
+
+
 private slots:
     void exampleFinished();
     void exampleError(QProcess::ProcessError error);
+
+
 
 private:
@@ -101 +111 @@
     void showDocInAssistant(const QString &docFile);
     void launchExample(const QString &uniqueName);
+
 
     void createMenu(const QDomElement &category, BUTTON_TYPE type);
@@ -129 +140 @@
     TextButton *upButton;
     TextButton *downButton;
+
 };