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

List:       kde-commits
Subject:    KDE/kdeaccessibility/kmouth
From:       Laurent Montel <montel () kde ! org>
Date:       2006-12-27 9:35:14
Message-ID: 1167212114.370579.11677.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 616896 by mlaurent:

Compile++


 M  +4 -4      kmouth.cpp  
 M  +1 -1      phrasebook/phrasebookdialog.cpp  
 M  +3 -1      phrasebook/phrasetree.cpp  


--- trunk/KDE/kdeaccessibility/kmouth/kmouth.cpp #616895:616896
@@ -28,7 +28,6 @@
 #include <klocale.h>
 #include <kconfig.h>
 #include <kstandardaction.h>
-#include <kstdaccel.h>
 #include <kprinter.h>
 #include <kmenu.h>
 #include <kstandarddirs.h>
@@ -37,6 +36,7 @@
 #include <kactioncollection.h>
 #include <kactionmenu.h>
 #include <ktoggleaction.h>
+#include <kstandardshortcut.h>
 // application specific includes
 #include "kmouth.h"
 #include "phraselist.h"
@@ -103,19 +103,19 @@
 void KMouthApp::initActions() {
 // The "File" menu
    fileOpen = new KAction(KIcon("phrasehistory_open"), i18n("&Open as History..."), \
                actionCollection(),"file_open");
-   fileOpen->setShortcut(KStdAccel::shortcut(KStdAccel::Open));
+   fileOpen->setDefaultShortcut(KStandardShortcut::open());
    connect(fileOpen, SIGNAL(triggered(bool)), this, SLOT(slotFileOpen()));
    fileOpen->setToolTip(i18n("Opens an existing file as history"));
    fileOpen->setWhatsThis (i18n("Opens an existing file as history"));
 
    fileSaveAs = new KAction(KIcon("phrasehistory_save"), i18n("Save &History \
                As..."), actionCollection(),"file_save_as");
-   fileSaveAs->setShortcut(KStdAccel::shortcut(KStdAccel::Save));
+   fileSaveAs->setDefaultShortcut(KStandardShortcut::save());
    connect(fileSaveAs, SIGNAL(triggered(bool)), this, SLOT(slotFileSaveAs()));
    fileSaveAs->setToolTip(i18n("Saves the actual history as..."));
    fileSaveAs->setWhatsThis (i18n("Saves the actual history as..."));
 
    filePrint = new KAction(KIcon("phrasehistory_print"), i18n("&Print History..."), \
                actionCollection(),"file_print");
-   filePrint->setShortcut(KStdAccel::shortcut(KStdAccel::Print));
+   filePrint->setDefaultShortcut(KStandardShortcut::print());
    connect(filePrint, SIGNAL(triggered(bool)), this, SLOT(slotFilePrint()));
    filePrint->setToolTip(i18n("Prints out the actual history"));
    filePrint->setWhatsThis (i18n("Prints out the actual history"));
--- trunk/KDE/kdeaccessibility/kmouth/phrasebook/phrasebookdialog.cpp #616895:616896
@@ -576,7 +576,7 @@
       int answer = KMessageBox::questionYesNoCancel (this,
               i18n("<qt>There are unsaved changes.<br>Do you want to apply the \
changes before closing the \"phrase book\" window or discard the changes?</qt>"),  \
                i18n("Closing \"Phrase Book\" Window"),
-          KStdGuiItem::apply(), KStdGuiItem::discard(), "AutomaticSave");
+          KStandardGuiItem::apply(), KStandardGuiItem::discard(), "AutomaticSave");
       if (answer == KMessageBox::Yes) {
          slotSave();
          return true;
--- trunk/KDE/kdeaccessibility/kmouth/phrasebook/phrasetree.cpp #616895:616896
@@ -18,7 +18,6 @@
 #include <klocale.h>
 #include <kconfig.h>
 #include <kaction.h>
-#include <kstdaccel.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kactionmenu.h>
@@ -482,6 +481,8 @@
 }
 
 bool PhraseTree::isStdAccelPresent (const KShortcut& cut, bool warnUser) {
+#warning "kde4: port it"
+#if 0	
    for (int iSeq = 0; iSeq < cut.count(); iSeq++) {
       const QKeySequence& seq = cut[iSeq];
 
@@ -496,6 +497,7 @@
          return true;
       }
    }
+#endif   
    return false;
 }
 


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