From kde-commits  Thu May 06 20:52:04 2004
From: Peter Hedlund <peter () peterandlinda ! com>
Date: Thu, 06 May 2004 20:52:04 +0000
To: kde-commits
Subject: kdeedu/kwordquiz/src
Message-Id: <20040506205204.265A31CEE () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=108387673012778

CVS commit by hedlund: 

Make it compile


  M +2 -2      kwordquiz.cpp   1.33
  M +1 -1      kwordquizdoc.cpp   1.7
  M +1 -1      kwordquizdoc.h   1.3
  M +1 -1      kwordquizprefs.cpp   1.5


--- kdeedu/kwordquiz/src/kwordquizprefs.cpp  #1.4:1.5
@@ -111,5 +111,5 @@ void KWordQuizPrefs::updateDialog()
   {
     it.current()->setText(2, (QString) Config().m_specialCharacters[i++] ) ;
-    it.current()->setText(1, win->actionCollection()->action("char_" + QString::number(i))->shortcut().toString());
+    it.current()->setText(1, win->actionCollection()->action(QString("char_" + QString::number(i)).latin1())->shortcut().toString());
   }
   

--- kdeedu/kwordquiz/src/kwordquiz.cpp  #1.32:1.33
@@ -590,5 +590,5 @@ bool KWordQuizApp::saveAsFileName( )
   bool success = false;
   
-  KFileDialog *fd = new KFileDialog(QDir::currentDirPath(), QString::null, this, QString::null, true);
+  KFileDialog *fd = new KFileDialog(QDir::currentDirPath(), QString::null, this, 0, true);
   fd -> setOperationMode(KFileDialog::Saving);
   fd -> setCaption(i18n("Save vocabulary document as..."));
@@ -1119,5 +1119,5 @@ void KWordQuizApp::updateSpecialCharIcon
 {
   for (int i = 0; i < 9; i++){
-    KAction * act = actionCollection()->action("char_" + QString::number(i + 1));
+    KAction * act = actionCollection()->action(QString("char_" + QString::number(i + 1)).latin1());
     act->setIcon(charIcon(Config().m_specialCharacters[i]));
     act->setToolTip(i18n("Inserts the character %1").arg(Config().m_specialCharacters[i]));

--- kdeedu/kwordquiz/src/kwordquizdoc.cpp  #1.6:1.7
@@ -40,5 +40,5 @@
 #include "version.h"
 
-QList<KWordQuizView> *KWordQuizDoc::pViewList = 0L;
+//QList<KWordQuizView> *KWordQuizDoc::pViewList = 0L;
 //KWordQuizView *KWordQuizDoc::m_view;
 

--- kdeedu/kwordquiz/src/kwordquizdoc.h  #1.2:1.3
@@ -87,5 +87,5 @@ class KWordQuizDoc : public QObject
   public:       
     /** the list of the views currently connected to the document */
-    static QList<KWordQuizView> *pViewList;     
+    //static QList<KWordQuizView> *pViewList;   
     //static KWordQuizView *m_view;
   private: