Prepare removal of Softkeys API

Change-Id: Ia68bdf1033717ecfc7e72cf2c24a85d0a4a1273f
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>

11 files changed, 0 insertions, 73 deletions

diff --git a/examples/organizer/calendardemo/src/addcalendarpage.cpp b/examples/organizer/calendardemo/src/addcalendarpage.cpp
index d7b932a58..9c479b2af 100644
--- a/examples/organizer/calendardemo/src/addcalendarpage.cpp
+++ b/examples/organizer/calendardemo/src/addcalendarpage.cpp
@@ -69,17 +69,6 @@ AddCalendarPage::AddCalendarPage(QWidget *parent)
     QVBoxLayout *mainLayout = new QVBoxLayout();
     mainLayout->addWidget(scrollArea);
     setLayout(mainLayout);
-
-    // Add softkeys
-    QAction* cancelSoftKey = new QAction("Cancel", this);
-    cancelSoftKey->setSoftKeyRole(QAction::NegativeSoftKey);
-    addAction(cancelSoftKey);
-    connect(cancelSoftKey, SIGNAL(triggered(bool)), this, SLOT(cancelClicked()));
-
-    QAction* saveSoftKey = new QAction("Save",this);
-    saveSoftKey->setSoftKeyRole(QAction::PositiveSoftKey);
-    addAction(saveSoftKey);
-    connect(saveSoftKey, SIGNAL(triggered(bool)), this, SLOT(saveClicked()));
 }
 
 AddCalendarPage::~AddCalendarPage()
diff --git a/examples/organizer/calendardemo/src/addcalendarpage.h b/examples/organizer/calendardemo/src/addcalendarpage.h
index 67f2f7eb3..948b2840e 100644
--- a/examples/organizer/calendardemo/src/addcalendarpage.h
+++ b/examples/organizer/calendardemo/src/addcalendarpage.h
@@ -77,7 +77,6 @@ Q_SIGNALS:
 private:
     QOrganizerManager *m_manager;
     QOrganizerCollection m_collection;
-    QAction *m_saveOrNextSoftKey;
 };
 
 #endif // ADDCALENDARPAGE_H
diff --git a/examples/organizer/calendardemo/src/calendardemo.cpp b/examples/organizer/calendardemo/src/calendardemo.cpp
index 28804bc16..afa0f6641 100644
--- a/examples/organizer/calendardemo/src/calendardemo.cpp
+++ b/examples/organizer/calendardemo/src/calendardemo.cpp
@@ -140,7 +140,6 @@ void CalendarDemo::buildMenu()
 {
     // Build Options menu
     QMenu *optionsMenu = new QMenu("&Options", this);
-    // We add the options menu to the softkey manually later
     menuBar()->addMenu(optionsMenu);
     // Add editing options in the menu
     QOrganizerManager defaultManager;
diff --git a/examples/organizer/calendardemo/src/editcalendarspage.cpp b/examples/organizer/calendardemo/src/editcalendarspage.cpp
index ce8c40a69..8a1e356b6 100644
--- a/examples/organizer/calendardemo/src/editcalendarspage.cpp
+++ b/examples/organizer/calendardemo/src/editcalendarspage.cpp
@@ -82,17 +82,6 @@ EditCalendarsPage::EditCalendarsPage(QWidget *parent)
     QVBoxLayout *mainLayout = new QVBoxLayout();
     mainLayout->addWidget(scrollArea);
     setLayout(mainLayout);
-
-    // Add softkeys
-    QAction* cancelSoftKey = new QAction("Back", this);
-    cancelSoftKey->setSoftKeyRole(QAction::NegativeSoftKey);
-    addAction(cancelSoftKey);
-    connect(cancelSoftKey, SIGNAL(triggered(bool)), this, SLOT(backClicked()));
-
-    QAction* editSoftKey = new QAction("Edit",this);
-    editSoftKey->setSoftKeyRole(QAction::PositiveSoftKey); // Perhaps SelectSoftKey
-    addAction(editSoftKey);
-    connect(editSoftKey, SIGNAL(triggered(bool)), this, SLOT(editClicked()));
 }
 
 EditCalendarsPage::~EditCalendarsPage()
diff --git a/examples/organizer/calendardemo/src/editcalendarspage.h b/examples/organizer/calendardemo/src/editcalendarspage.h
index c9794a531..aee092243 100644
--- a/examples/organizer/calendardemo/src/editcalendarspage.h
+++ b/examples/organizer/calendardemo/src/editcalendarspage.h
@@ -82,7 +82,6 @@ protected: // from QWidget
 private:
     QOrganizerManager *m_manager;
     QOrganizerCollection m_collection;
-    QAction *m_saveOrNextSoftKey;
     QListWidget *m_calendarList;
 };
 
diff --git a/examples/organizer/calendardemo/src/eventeditpage.cpp b/examples/organizer/calendardemo/src/eventeditpage.cpp
index 44f64aefa..f2351fe69 100644
--- a/examples/organizer/calendardemo/src/eventeditpage.cpp
+++ b/examples/organizer/calendardemo/src/eventeditpage.cpp
@@ -152,16 +152,6 @@ EventEditPage::EventEditPage(QWidget *parent)
     mainLayout->addWidget(scrollArea);
     setLayout(mainLayout);
 
-    // Add softkeys
-    QAction* cancelSoftKey = new QAction("Cancel", this);
-    cancelSoftKey->setSoftKeyRole(QAction::NegativeSoftKey);
-    addAction(cancelSoftKey);
-    connect(cancelSoftKey, SIGNAL(triggered(bool)), this, SLOT(cancelClicked()));
-    
-    QAction* saveSoftKey = new QAction("Save",this);
-    saveSoftKey->setSoftKeyRole(QAction::PositiveSoftKey);
-    addAction(saveSoftKey);
-    connect(saveSoftKey, SIGNAL(triggered(bool)), this, SLOT(saveClicked()));
     m_listOfEvents.clear();
 }
 
diff --git a/examples/organizer/calendardemo/src/eventeditpage.h b/examples/organizer/calendardemo/src/eventeditpage.h
index 86b1fab07..b66991ba0 100644
--- a/examples/organizer/calendardemo/src/eventeditpage.h
+++ b/examples/organizer/calendardemo/src/eventeditpage.h
@@ -97,7 +97,6 @@ private:
     QList<QOrganizerItem> m_listOfEvents;
     QOrganizerItemSaveRequest *m_saveItemRequest;
     QVBoxLayout *m_repeatControls;
-    QAction *m_saveOrNextSoftKey;
     QComboBox *m_alarmComboBox;
     QComboBox *m_typeComboBox;
     QLineEdit *m_subjectEdit;
diff --git a/examples/organizer/calendardemo/src/eventoccurrenceeditpage.cpp b/examples/organizer/calendardemo/src/eventoccurrenceeditpage.cpp
index 1eed2e31b..11acf9926 100644
--- a/examples/organizer/calendardemo/src/eventoccurrenceeditpage.cpp
+++ b/examples/organizer/calendardemo/src/eventoccurrenceeditpage.cpp
@@ -94,16 +94,6 @@ EventOccurrenceEditPage::EventOccurrenceEditPage(QWidget *parent)
     mainLayout->addWidget(scrollArea);
     setLayout(mainLayout);
 
-    // Add softkeys
-    QAction* cancelSoftKey = new QAction("Cancel", this);
-    cancelSoftKey->setSoftKeyRole(QAction::NegativeSoftKey);
-    addAction(cancelSoftKey);
-    connect(cancelSoftKey, SIGNAL(triggered(bool)), this, SLOT(cancelClicked()));
-
-    m_saveOrNextSoftKey = new QAction("Save",this);
-    m_saveOrNextSoftKey->setSoftKeyRole(QAction::PositiveSoftKey);
-    addAction(m_saveOrNextSoftKey);
-    connect(m_saveOrNextSoftKey, SIGNAL(triggered(bool)), this, SLOT(saveOrNextClicked()));
     m_countFieldAdded = false;
     m_multipleEntries = false;
     m_listOfEvents.clear();
@@ -143,10 +133,6 @@ void EventOccurrenceEditPage::saveOrNextClicked()
     m_listOfEvents.append(m_organizerEventOccurrence);
     if(m_numOfEntiresToBeCreated > 1){
         m_numOfEntiresToBeCreated--;
-        if(m_numOfEntiresToBeCreated == 1){
-                // For the last entry change the option to Save.
-                m_saveOrNextSoftKey->setText("SaveAll");
-        }
         // Clear subject field indicating its a new editor.
         m_subjectEdit->clear();
     } else {
diff --git a/examples/organizer/calendardemo/src/eventoccurrenceeditpage.h b/examples/organizer/calendardemo/src/eventoccurrenceeditpage.h
index fc18030ae..8489511b0 100644
--- a/examples/organizer/calendardemo/src/eventoccurrenceeditpage.h
+++ b/examples/organizer/calendardemo/src/eventoccurrenceeditpage.h
@@ -90,7 +90,6 @@ private:
     QList<QOrganizerItem> m_listOfEvents;
     QOrganizerItemSaveRequest *m_saveItemRequest;
     QVBoxLayout *scrollAreaLayout;
-    QAction *m_saveOrNextSoftKey;
     QComboBox *m_typeComboBox;
     QLineEdit *m_subjectEdit;
     QDateTimeEdit *m_startTimeEdit;
diff --git a/examples/organizer/calendardemo/src/journaleditpage.cpp b/examples/organizer/calendardemo/src/journaleditpage.cpp
index 86552638b..7e5128398 100644
--- a/examples/organizer/calendardemo/src/journaleditpage.cpp
+++ b/examples/organizer/calendardemo/src/journaleditpage.cpp
@@ -112,17 +112,6 @@ JournalEditPage::JournalEditPage(QWidget *parent)
     QVBoxLayout *mainLayout = new QVBoxLayout();
     mainLayout->addWidget(scrollArea);
     setLayout(mainLayout);
-
-    // Add softkeys
-    QAction* cancelSoftKey = new QAction("Cancel", this);
-    cancelSoftKey->setSoftKeyRole(QAction::NegativeSoftKey);
-    addAction(cancelSoftKey);
-    connect(cancelSoftKey, SIGNAL(triggered(bool)), this, SLOT(cancelClicked()));
-
-    QAction* saveSoftKey = new QAction("Save", this);
-    saveSoftKey->setSoftKeyRole(QAction::PositiveSoftKey);
-    addAction(saveSoftKey);
-    connect(saveSoftKey, SIGNAL(triggered(bool)), this, SLOT(saveClicked()));
 }
 
 JournalEditPage::~JournalEditPage()
diff --git a/examples/organizer/calendardemo/src/todoeditpage.cpp b/examples/organizer/calendardemo/src/todoeditpage.cpp
index 88367ca01..25db0402c 100644
--- a/examples/organizer/calendardemo/src/todoeditpage.cpp
+++ b/examples/organizer/calendardemo/src/todoeditpage.cpp
@@ -129,17 +129,6 @@ TodoEditPage::TodoEditPage(QWidget *parent)
     mainLayout->addWidget(scrollArea);
     setLayout(mainLayout);
 
-    // Add softkeys
-    QAction* cancelSoftKey = new QAction("Cancel", this);
-    cancelSoftKey->setSoftKeyRole(QAction::NegativeSoftKey);
-    addAction(cancelSoftKey);
-    connect(cancelSoftKey, SIGNAL(triggered(bool)), this, SLOT(cancelClicked()));
-    
-    QAction* saveSoftKey = new QAction("Save", this);
-    saveSoftKey->setSoftKeyRole(QAction::PositiveSoftKey);
-    addAction(saveSoftKey);
-    connect(saveSoftKey, SIGNAL(triggered(bool)), this, SLOT(saveClicked()));
-    
     // Fill priority combo
     m_priorityEdit->addItem("Unknown", QVariant(QOrganizerItemPriority::UnknownPriority));
     m_priorityEdit->addItem("Highest", QVariant(QOrganizerItemPriority::HighestPriority));