Commit 5ee044bd authored by Michal Humpula's avatar Michal Humpula

migrate from KAction to QAction (1/3)

REVIEW: 114507
parent d8b350c6
......@@ -34,12 +34,11 @@
#include "katesession.h"
#include "kateviewspace.h"
#include "katequickopen.h"
#include "katedebug.h"
#include <kate/mainwindow.h>
#include <KAboutApplicationDialog>
#include <KAction>
#include "katedebug.h"
#include <KEditToolBar>
#include <KGlobal>
#include <KShortcutsDialog>
......
......@@ -29,8 +29,6 @@
#include <KParts/Part>
#include <KAction>
#include <QDragEnterEvent>
#include <QEvent>
#include <QDropEvent>
......
......@@ -28,10 +28,10 @@
#include <kpluginfactory.h>
#include <kpluginloader.h>
#include <kaboutdata.h>
#include <klineedit.h>
#include <kactioncollection.h>
#include <kaction.h>
#include <klocalizedstring.h>
#include <qtreeview.h>
#include <qwidget.h>
#include <qboxlayout.h>
......@@ -42,7 +42,6 @@
#include <qcoreapplication.h>
#include <QDesktopWidget>
#include <QFileInfo>
#include <klocalizedstring.h>
Q_DECLARE_METATYPE(QPointer<KTextEditor::Document>)
......
......@@ -33,7 +33,6 @@
#include <KTextEditor/Attribute>
#include <KTextEditor/HighlightInterface>
#include <KAction>
#include <KActionCollection>
#include <KCmdLineArgs>
#include "katedebug.h"
......
......@@ -32,12 +32,12 @@
#include <kaboutdata.h>
#include <kpluginfactory.h>
#include <KAction>
#include <KActionCollection>
#include <klocalizedstring.h>
#include <KConfigGroup>
#include <QAction>
#include <QApplication>
#include "katefiletreedebug.h"
......
......@@ -30,7 +30,7 @@ class KTextEditor::AttributePrivate
dynamicAttributes.append(Attribute::Ptr());
}
QList<KAction*> associatedActions;
QList<QAction *> associatedActions;
QList<Attribute::Ptr> dynamicAttributes;
};
......@@ -168,7 +168,7 @@ bool Attribute::hasAnyProperty( ) const
return properties().count();
}
const QList< KAction * > & Attribute::associatedActions( ) const
const QList<QAction *> & Attribute::associatedActions( ) const
{
return d->associatedActions;
}
......
......@@ -27,7 +27,7 @@
#include <ktexteditor/ktexteditor_export.h>
class KAction;
class QAction;
namespace KTextEditor
{
......@@ -215,7 +215,7 @@ class KTEXTEDITOR_EXPORT Attribute : public QTextCharFormat, public QSharedData
* \}
* \name Action association
*
* The following functions allow for KAction%s to be associated with attributes,
* The following functions allow for QAction%s to be associated with attributes,
* and thus with ranges which use this attribute.
*
* \note This feature is currently not implemented (ETA KDE 4.1).
......@@ -227,25 +227,25 @@ class KTEXTEDITOR_EXPORT Attribute : public QTextCharFormat, public QSharedData
* disable them on exit. The action is also added to the context menu when
* the caret is within an associated range.
*
* \param action KAction to associate with this Attribute
* \param action QAction to associate with this Attribute
*/
void associateAction(KAction* action);
void associateAction(QAction* action);
/**
* Remove the association with an action from this attribute; it will no
* longer be managed by associated ranges.
*
* \param action KAction to dissociate from this Attribute
* \param action QAction to dissociate from this Attribute
*/
void dissociateAction(KAction* action);
void dissociateAction(QAction* action);
/**
* Returns a list of currently associated KAction%s.
* Returns a list of currently associated QAction%s.
*/
const QList<KAction*>& associatedActions() const;
const QList<QAction*>& associatedActions() const;
/**
* Clears all associations between KAction%s and this attribute.
* Clears all associations between QAction%s and this attribute.
*/
void clearAssociatedActions();
//!\}
......
......@@ -31,7 +31,6 @@
#include <kaboutapplicationdialog.h>
#include <kaboutdata.h>
#include <kaction.h>
#include <kactioncollection.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
......
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