From: Aaron J. Seigo <aseigo@kde.org>
Date: Mon, 4 Dec 2006 15:55:31 +0000 (+0000)
Subject: makeStandardCaption
X-Git-Tag: v3.80.3~99
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=dc10a01c540fbca9eb7943d2f905a97db44b7c76;p=libqmvoc.git

makeStandardCaption

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=610591
---

diff --git a/kdeeducore/keduvocdocument.cpp b/kdeeducore/keduvocdocument.cpp
index 50f868d..170a10d 100644
--- a/kdeeducore/keduvocdocument.cpp
+++ b/kdeeducore/keduvocdocument.cpp
@@ -17,12 +17,12 @@
 
 #include "keduvocdocument.h"
 
+#include <QApplication>
 #include <QFileInfo>
 #include <QList>
 #include <QTextStream>
 #include <QtAlgorithms>
 
-#include <kapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
@@ -170,7 +170,7 @@ bool KEduVocDocument::open(const KUrl& url, bool /*append*/)
         // the two messages should be merged
         QString msg = i18n("Could not load \"%1\"\nDo you want to try again?", url.path());
         int result = KMessageBox::warningContinueCancel(0, msg,
-                                                        kapp->makeStdCaption(i18n("I/O Failure")),
+                                                        i18n("I/O Failure"),
                                                         KGuiItem(i18n("&Retry")));
         if ( result == KMessageBox::Cancel ) {
           Init();
@@ -267,7 +267,7 @@ bool KEduVocDocument::saveAs(QObject *parent, const KUrl & url, FileType ft, con
       // the two messages should be merged
       QString msg = i18n("Could not save \"%1\"\nDo you want to try again?", tmp.path());
       int result = KMessageBox::warningContinueCancel(0, msg,
-                                                      kapp->makeStdCaption(i18n("I/O Failure")),
+                                                      i18n("I/O Failure"),
                                                       KGuiItem(i18n("&Retry")));
       if ( result == KMessageBox::Cancel ) return false;
     }
diff --git a/kdeeducore/keduvockvtmlreader.cpp b/kdeeducore/keduvockvtmlreader.cpp
index 8d554ab..214ba16 100644
--- a/kdeeducore/keduvockvtmlreader.cpp
+++ b/kdeeducore/keduvockvtmlreader.cpp
@@ -16,11 +16,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
+#include <QApplication>
 #include <QTextStream>
 #include <QList>
 
@@ -1665,7 +1665,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const QString &elem)
       "read documents with unknown elements.\n", elem
      );
   QApplication::changeOverrideCursor(Qt::ArrowCursor);
-  QString s = kapp->makeStdCaption(i18n("Unknown element"));
+  QString s = i18n("Unknown element");
   KMessageBox::sorry(0, ln+msg, s);
   QApplication::restoreOverrideCursor();
 }
@@ -1673,7 +1673,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const QString &elem)
 void KEduVocKvtmlReader::domError(const QString &text )
 {
   QApplication::changeOverrideCursor(Qt::ArrowCursor);
-  QString s = kapp->makeStandardCaption(i18n("Error"), this);
+  QString s = i18n("Error");
   QString ln = i18n("File:\t%1\n", m_doc->URL().path());
   QString msg = text;
   KMessageBox::error(0, ln+msg, s);