[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] importwizard: Rename class
From:       Montel Laurent <montel () kde ! org>
Date:       2012-02-29 21:30:27
Message-ID: 20120229213027.91C2AA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit eda207c4e63bd38bc354fa8eba2eba06f03a0a32 by Montel Laurent.
Committed on 29/02/2012 at 22:30.
Pushed by mlaurent into branch 'master'.

Rename class

M  +2    -2    importwizard/CMakeLists.txt
M  +6    -6    importwizard/importwizard.cpp
M  +2    -2    importwizard/importwizard.h
R  +9    -9    importwizard/selectprogrampage.cpp [from: \
importwizard/checkprogrampage.cpp - 073% similarity] R  +8    -8    \
importwizard/selectprogrampage.h [from: importwizard/checkprogrampage.h - 078% \
similarity] R  +2    -2    importwizard/ui/selectprogrampage.ui [from: \
importwizard/ui/checkprogrampage.ui - 095% similarity]

http://commits.kde.org/kdepim/eda207c4e63bd38bc354fa8eba2eba06f03a0a32

diff --git a/importwizard/CMakeLists.txt b/importwizard/CMakeLists.txt
index b0acae3..dbe3160 100644
--- a/importwizard/CMakeLists.txt
+++ b/importwizard/CMakeLists.txt
@@ -2,7 +2,7 @@ project(importwizard)
 
 set(importwizard_SRCS
 importwizardkernel.cpp
-checkprogrampage.cpp
+selectprogrampage.cpp
 importaddressbookpage.cpp
 importfilterpage.cpp
 importmailpage.cpp
@@ -24,7 +24,7 @@ include_directories(${CMAKE_SOURCE_DIR}/mailimporter \
${CMAKE_SOURCE_DIR}/mailcom  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
${KDE4_ENABLE_EXCEPTIONS}" )  
 kde4_add_ui_files(importwizard_SRCS 
-                  ui/checkprogrampage.ui
+                  ui/selectprogrampage.ui
                   ui/importaddressbookpage.ui
                   ui/importfilterpage.ui
                   ui/importmailpage.ui
diff --git a/importwizard/importwizard.cpp b/importwizard/importwizard.cpp
index 12decda..5b8a196 100644
--- a/importwizard/importwizard.cpp
+++ b/importwizard/importwizard.cpp
@@ -17,7 +17,7 @@
 
 #include "importwizard.h"
 #include "importwizardkernel.h"
-#include "checkprogrampage.h"
+#include "selectprogrampage.h"
 #include "selectcomponentpage.h"
 #include "importmailpage.h"
 #include "importfilterpage.h"
@@ -48,8 +48,8 @@ ImportWizard::ImportWizard(QWidget *parent)
   CommonKernel->registerKernelIf( kernel ); //register KernelIf early, it is used by \
the Filter classes  CommonKernel->registerSettingsIf( kernel ); //SettingsIf is used \
in FolderTreeWidget  
-  mCheckProgramPage = new CheckProgramPage(this);
-  mPage1 = new KPageWidgetItem( mCheckProgramPage, i18n( "Detect program" ) );
+  mSelectProgramPage = new SelectProgramPage(this);
+  mPage1 = new KPageWidgetItem( mSelectProgramPage, i18n( "Detect program" ) );
   addPage( mPage1);
 
   mSelectComponentPage = new SelectComponentPage(this);
@@ -88,7 +88,7 @@ ImportWizard::ImportWizard(QWidget *parent)
   setValid( currentPage(), false );
 
   connect(this,SIGNAL(helpClicked()),this,SLOT(help()));
-  connect(mCheckProgramPage,SIGNAL(programSelected(QString)),this,SLOT(slotProgramSelected(QString)));
 +  connect(mSelectProgramPage,SIGNAL(programSelected(QString)),this,SLOT(slotProgramSelected(QString)));
  connect(mImportMailPage,SIGNAL(importMailsClicked()),this,SLOT(slotImportMailsClicked()));
  Akonadi::Control::widgetNeedsAkonadi(this);
 
@@ -122,7 +122,7 @@ void ImportWizard::slotProgramSelected(const QString& program)
 
 void ImportWizard::checkModules()
 {
-  mCheckProgramPage->setFoundProgram(mlistImport.keys());
+  mSelectProgramPage->setFoundProgram(mlistImport.keys());
 }
 
 void ImportWizard::addImportModule(PimImportAbstract *import)
@@ -150,7 +150,7 @@ void ImportWizard::next()
 {
    if( currentPage() == mPage1 ) {
       KAssistantDialog::next();
-      mCheckProgramPage->disableSelectProgram();
+      mSelectProgramPage->disableSelectProgram();
       mSelectComponentPage->setEnabledComponent(mSelectedPim->supportedOption());
     } else if( currentPage() == mPage2 ) {
       setAppropriatePage(mSelectComponentPage->selectedComponents());
diff --git a/importwizard/importwizard.h b/importwizard/importwizard.h
index 99cfb80..83b6600 100644
--- a/importwizard/importwizard.h
+++ b/importwizard/importwizard.h
@@ -24,7 +24,7 @@
 #include <KAssistantDialog>
 
 class KPageWidgetItem;
-class CheckProgramPage;
+class SelectProgramPage;
 class SelectComponentPage;
 class ImportMailPage;
 class ImportFilterPage;
@@ -68,7 +68,7 @@ private:
   KPageWidgetItem *mPage6;
   KPageWidgetItem *mPage7;
 
-  CheckProgramPage *mCheckProgramPage;
+  SelectProgramPage *mSelectProgramPage;
   SelectComponentPage *mSelectComponentPage;
   ImportMailPage *mImportMailPage;
   ImportFilterPage *mImportFilterPage;
diff --git a/importwizard/checkprogrampage.cpp b/importwizard/selectprogrampage.cpp
similarity index 73%
rename from importwizard/checkprogrampage.cpp
rename to importwizard/selectprogrampage.cpp
index 2fc6607..b491631 100644
--- a/importwizard/checkprogrampage.cpp
+++ b/importwizard/selectprogrampage.cpp
@@ -15,36 +15,36 @@
   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "checkprogrampage.h"
-#include "ui_checkprogrampage.h"
+#include "selectprogrampage.h"
+#include "ui_selectprogrampage.h"
 
-CheckProgramPage::CheckProgramPage(QWidget *parent) :
+SelectProgramPage::SelectProgramPage(QWidget *parent) :
   QWidget(parent),
-  ui(new Ui::CheckProgramPage)
+  ui(new Ui::SelectProgramPage)
 {
   ui->setupUi(this);
   connect(ui->listProgramFound,SIGNAL(itemSelectionChanged()),this,SLOT(slotItemSelectionChanged()));
  }
 
-CheckProgramPage::~CheckProgramPage()
+SelectProgramPage::~SelectProgramPage()
 {
   delete ui;
 }
 
-void CheckProgramPage::setFoundProgram(const QStringList& list)
+void SelectProgramPage::setFoundProgram(const QStringList& list)
 {
     ui->listProgramFound->addItems(list);
 }
 
-void CheckProgramPage::slotItemSelectionChanged()
+void SelectProgramPage::slotItemSelectionChanged()
 {
     if(ui->listProgramFound->currentItem())
         emit programSelected(ui->listProgramFound->currentItem()->text());
 }
 
-void CheckProgramPage::disableSelectProgram()
+void SelectProgramPage::disableSelectProgram()
 {
   ui->listProgramFound->setEnabled( false );
 }
 
-#include "checkprogrampage.moc"
+#include "selectprogrampage.moc"
diff --git a/importwizard/checkprogrampage.h b/importwizard/selectprogrampage.h
similarity index 78%
rename from importwizard/checkprogrampage.h
rename to importwizard/selectprogrampage.h
index 950eb97..b614067 100644
--- a/importwizard/checkprogrampage.h
+++ b/importwizard/selectprogrampage.h
@@ -15,22 +15,22 @@
   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef CHECKPROGRAMPAGE_H
-#define CHECKPROGRAMPAGE_H
+#ifndef SELECTPROGRAMPAGE_H
+#define SELECTPROGRAMPAGE_H
 
 #include <QWidget>
 
 namespace Ui {
-  class CheckProgramPage;
+  class SelectProgramPage;
 }
 
-class CheckProgramPage : public QWidget
+class SelectProgramPage : public QWidget
 {
   Q_OBJECT
   
 public:
-  explicit CheckProgramPage(QWidget *parent = 0);
-  ~CheckProgramPage();
+  explicit SelectProgramPage(QWidget *parent = 0);
+  ~SelectProgramPage();
     void setFoundProgram(const QStringList& list);
   void disableSelectProgram();
 
@@ -41,7 +41,7 @@ signals:
     void programSelected(const QString&);
 
 private:
-  Ui::CheckProgramPage *ui;
+  Ui::SelectProgramPage *ui;
 };
 
-#endif // CHECKPROGRAMPAGE_H
+#endif // SELECTPROGRAMPAGE_H
diff --git a/importwizard/ui/checkprogrampage.ui \
b/importwizard/ui/selectprogrampage.ui similarity index 95%
rename from importwizard/ui/checkprogrampage.ui
rename to importwizard/ui/selectprogrampage.ui
index 7d4c9f9..62738c0 100644
--- a/importwizard/ui/checkprogrampage.ui
+++ b/importwizard/ui/selectprogrampage.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>CheckProgramPage</class>
- <widget class="QWidget" name="CheckProgramPage">
+ <class>SelectProgramPage</class>
+ <widget class="QWidget" name="SelectProgramPage">
   <property name="geometry">
    <rect>
     <x>0</x>


[prev in list] [next in list] [prev in thread] [next in thread]