Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit f3f24e28 authored by Jeremy Whiting's avatar Jeremy Whiting

Port from KAction to QAction.

parent 982bcfb1
......@@ -27,7 +27,7 @@
#include <QXmlInputSource>
#include <QXmlSimpleReader>
#include <KAction>
#include <QAction>
#include <KActionMenu>
#include <KActionCollection>
#include <KDesktopFile>
......@@ -488,7 +488,7 @@ void PhraseBook::addToGUI(QMenu *popup, KToolBar *toolbar, KActionCollection *ph
}
if ((*it).isPhrase()) {
Phrase phrase = (*it).getPhrase();
KAction *action = new PhraseAction(phrase.getPhrase(),
QAction *action = new PhraseAction(phrase.getPhrase(),
phrase.getShortcut(), receiver, slot, phrases);
if (parent == popup)
toolbar->addAction(action);
......
......@@ -24,7 +24,7 @@
#include <QTextStream>
#include <QXmlInputSource>
#include <KAction>
#include <QAction>
#include <KActionCollection>
#include <KIcon>
#include <KToolBar>
......@@ -161,12 +161,12 @@ private:
static QString displayPath(QString path);
};
class PhraseAction : public KAction
class PhraseAction : public QAction
{
Q_OBJECT
public:
PhraseAction(const QString& phrase, const QString& cut, const QObject* receiver, const char* slot, KActionCollection* parent)
: KAction(KIcon(QLatin1String("phrase")), phrase, parent)
: QAction(KIcon(QLatin1String("phrase")), phrase, parent)
{
this->setShortcut(cut);
this->phrase = phrase;
......
......@@ -51,7 +51,7 @@ const QIcon kPhraseBookIcon = KIcon(kPhraseBook);
const QIcon kPhraseIcon = KIcon(kPhrase);
StandardPhraseBookInsertAction::StandardPhraseBookInsertAction(const KUrl &url, const QString& name, const QObject* receiver, const char* slot, KActionCollection* parent)
: KAction(KIcon(QLatin1String("phrasebook")), name, parent)
: QAction(KIcon(QLatin1String("phrasebook")), name, parent)
{
this->url = url;
connect(this, SIGNAL(triggered(bool)), this, SLOT(slotActivated()));
......@@ -325,7 +325,7 @@ void PhraseBookDialog::initStandardPhraseBooks()
}
currentNamePath = dirs;
KAction *book = new StandardPhraseBookInsertAction(
QAction *book = new StandardPhraseBookInsertAction(
url, (*it).name, this, SLOT(slotImportPhrasebook(KUrl)), actionCollection());
parent->addAction(book);
if (parent == fileImportStandardBook)
......
......@@ -21,7 +21,7 @@
#include <QDomNode>
#include <QStandardItemModel>
#include <KAction>
#include <QAction>
#include <KIcon>
#include <KUrl>
#include <KXmlGuiWindow>
......@@ -37,7 +37,7 @@ class KToolBarPopupAction;
* inserting a standard phrase book.
* @author Gunnar Schmi Dt
*/
class StandardPhraseBookInsertAction : public KAction
class StandardPhraseBookInsertAction : public QAction
{
Q_OBJECT
public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment