SVN commit 638151 by pino:

less usage of kapp, using qApp when possible


 M  +0 -1      common-dialogs/languageoptions.cpp  
 M  +1 -0      kva_config.cpp  
 M  +1 -0      kva_io.cpp  
 M  +1 -2      kva_query.cpp  
 M  +0 -1      kvoctrain.h  
 M  +1 -0      main.cpp  
 M  +0 -1      query-dialogs/AdjQueryDlg.cpp  
 M  +0 -1      query-dialogs/ArtQueryDlg.cpp  
 M  +0 -1      query-dialogs/MCQueryDlg.cpp  
 M  +3 -3      query-dialogs/RandomQueryDlg.cpp  
 M  +0 -1      query-dialogs/SimpleQueryDlg.cpp  
 M  +0 -1      query-dialogs/VerbQueryDlg.cpp  


--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp #638150:638151
@@ -31,7 +31,6 @@
 #include <QByteArray>
 #include <QMenu>
 
-#include <kapplication.h>
 #include <klocale.h>
 #include <kcombobox.h>
 #include <kstandarddirs.h>
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/kva_config.cpp #638150:638151
@@ -25,6 +25,7 @@
 
 #include <QFile>
 
+#include <kapplication.h>
 #include <krecentfilesaction.h>
 #include <kglobal.h>
 
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/kva_io.cpp #638150:638151
@@ -28,6 +28,7 @@
 #include <QTimer>
 #include <QFrame>
 
+#include <kapplication.h>
 #include <kfiledialog.h>
 #include <kcombobox.h>
 #include <qprogressbar.h>
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/kva_query.cpp #638150:638151
@@ -23,8 +23,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QApplication>
-
+#include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/kvoctrain.h #638150:638151
@@ -34,7 +34,6 @@
 #include <QListView>
 #include <QPushButton>
 
-#include <kapplication.h>
 #include <kmainwindow.h>
 #include <kaction.h>
 #include <kmenubar.h>
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/main.cpp #638150:638151
@@ -21,6 +21,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <klocale.h>
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp #638150:638151
@@ -29,7 +29,6 @@
 #include <QLabel>
 #include <QKeyEvent>
 
-#include <kapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp #638150:638151
@@ -32,7 +32,6 @@
 
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kapplication.h>
 
 #include "ArtQueryDlg.h"
 #include <kv_resource.h>
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp #638150:638151
@@ -30,7 +30,6 @@
 #include <QPushButton>
 #include <QKeyEvent>
 
-#include <kapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kdebug.h>
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp #638150:638151
@@ -23,6 +23,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QApplication>
 #include <QCheckBox>
 #include <QGroupBox>
 #include <QLabel>
@@ -38,7 +39,6 @@
 
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kapplication.h>
 
 #include "RandomQueryDlg.h"
 #include "common-dialogs/ProgressDlg.h"
@@ -215,7 +215,7 @@
       pdlg = new ProgressDlg (QString(), QString(), i18n("Loading Random Query"));
       pdlg -> resize (pdlg -> width(), pdlg -> minimumSize().height());
       pdlg -> show();
-      kapp -> processEvents();
+      qApp -> processEvents();
     }
     for ( i = 0; i < kv_doc -> entryCount(); i ++ )
     {
@@ -234,7 +234,7 @@
       if ( pdlg )
       {
         pdlg -> setValue (doc, i * 100 / kv_doc -> entryCount());
-        kapp -> processEvents();
+        qApp -> processEvents();
       }
     }
     vocabulary.sort();
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp #638150:638151
@@ -30,7 +30,6 @@
 #include <QKeyEvent>
 #include <QWidget>
 
-#include <kapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp #638150:638151
@@ -29,7 +29,6 @@
 #include <QLineEdit>
 #include <QKeyEvent>
 
-#include <kapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>