aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/actioneditor
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/actioneditor')
-rw-r--r--src/modules/actioneditor/ActionEditor.cpp (renamed from src/modules/actioneditor/actioneditor.cpp)114
-rw-r--r--src/modules/actioneditor/ActionEditor.h (renamed from src/modules/actioneditor/actioneditor.h)64
-rw-r--r--src/modules/actioneditor/CMakeLists.txt4
-rw-r--r--src/modules/actioneditor/libkviactioneditor.cpp6
4 files changed, 94 insertions, 94 deletions
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/ActionEditor.cpp
index 0d80af6f2..c20b762e7 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/ActionEditor.cpp
@@ -1,6 +1,6 @@
//=============================================================================
//
-// File : aliaseditor.cpp
+// File : AliasEditorWindow.cpp
// Creation date : Tue 29 Dec 2004 02:45:59 2002 GMT by Szymon Stefanek
//
// This file is part of the KVIrc irc client distribution
@@ -21,7 +21,7 @@
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
//=============================================================================
-#include "actioneditor.h"
+#include "ActionEditor.h"
#include "KviIconManager.h"
#include "KviOptions.h"
@@ -58,7 +58,7 @@
#include <QLabel>
-extern KviActionEditorWindow * g_pActionEditorWindow;
+extern ActionEditorWindow * g_pActionEditorWindow;
static QString g_szLastEditedAction;
@@ -67,7 +67,7 @@ static QString g_szLastEditedAction;
#define LVI_SPACING 8
#define LVI_MINIMUM_CELL_WIDTH (LVI_MINIMUM_TEXT_WIDTH + LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING + LVI_BORDER)
-KviActionEditorTreeWidgetItem::KviActionEditorTreeWidgetItem(QTreeWidget * v,KviActionData * a)
+ActionEditorTreeWidgetItem::ActionEditorTreeWidgetItem(QTreeWidget * v,ActionData * a)
: QTreeWidgetItem(v)
{
m_pActionData = a;
@@ -81,18 +81,18 @@ KviActionEditorTreeWidgetItem::KviActionEditorTreeWidgetItem(QTreeWidget * v,Kvi
if(p)setIcon(0,*p);
}
-KviActionEditorTreeWidgetItem::~KviActionEditorTreeWidgetItem()
+ActionEditorTreeWidgetItem::~ActionEditorTreeWidgetItem()
{
delete m_pActionData;
}
-QString KviActionEditorTreeWidgetItem::key(int,bool) const
+QString ActionEditorTreeWidgetItem::key(int,bool) const
{
return m_szKey;
}
-KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed)
+SingleActionEditor::SingleActionEditor(QWidget * par,ActionEditor * ed)
: QWidget(par)
{
m_pActionEditor = ed;
@@ -294,11 +294,11 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed)
}
}
-KviSingleActionEditor::~KviSingleActionEditor()
+SingleActionEditor::~SingleActionEditor()
{
}
-void KviSingleActionEditor::channelQueryOrConsoleWindowCheckToggled(bool)
+void SingleActionEditor::channelQueryOrConsoleWindowCheckToggled(bool)
{
m_pChannelOnlyIfUsersSelectedCheck->setEnabled(m_pWindowChannelCheck->isChecked());
m_pChannelOnlyIfUsersSelectedCheck->setChecked(false);
@@ -308,7 +308,7 @@ void KviSingleActionEditor::channelQueryOrConsoleWindowCheckToggled(bool)
m_pConsoleOnlyIfUsersSelectedCheck->setChecked(false);
}
-void KviSingleActionEditor::needsContextCheckToggled(bool)
+void SingleActionEditor::needsContextCheckToggled(bool)
{
m_pEnableAtLoginCheck->setChecked(false);
m_pEnableAtLoginCheck->setEnabled(false);
@@ -316,13 +316,13 @@ void KviSingleActionEditor::needsContextCheckToggled(bool)
m_pNeedsConnectionCheck->setEnabled(m_pNeedsContextCheck->isChecked());
}
-void KviSingleActionEditor::needsConnectionCheckToggled(bool)
+void SingleActionEditor::needsConnectionCheckToggled(bool)
{
m_pEnableAtLoginCheck->setChecked(false);
m_pEnableAtLoginCheck->setEnabled(m_pNeedsConnectionCheck->isChecked());
}
-void KviSingleActionEditor::specificWindowsCheckToggled(bool)
+void SingleActionEditor::specificWindowsCheckToggled(bool)
{
m_pWindowConsoleCheck->setChecked(false);
m_pWindowChannelCheck->setChecked(false);
@@ -341,7 +341,7 @@ void KviSingleActionEditor::specificWindowsCheckToggled(bool)
m_pWindowDccChatCheck->setEnabled(b);
}
-void KviSingleActionEditor::displaySmallIcon(const QString &szIconId)
+void SingleActionEditor::displaySmallIcon(const QString &szIconId)
{
QPixmap * pix = g_pIconManager->getImage(szIconId);
@@ -356,7 +356,7 @@ void KviSingleActionEditor::displaySmallIcon(const QString &szIconId)
}
-void KviSingleActionEditor::displayBigIcon(const QString &szIconId)
+void SingleActionEditor::displayBigIcon(const QString &szIconId)
{
QPixmap * pix = g_pIconManager->getImage(szIconId);
@@ -370,7 +370,7 @@ void KviSingleActionEditor::displayBigIcon(const QString &szIconId)
}
}
-void KviSingleActionEditor::chooseSmallIcon()
+void SingleActionEditor::chooseSmallIcon()
{
if(!m_pActionData)return;
KviImageDialog * d = new KviImageDialog(this);
@@ -383,7 +383,7 @@ void KviSingleActionEditor::chooseSmallIcon()
displaySmallIcon(s);
}
-void KviSingleActionEditor::chooseBigIcon()
+void SingleActionEditor::chooseBigIcon()
{
if(!m_pActionData)return;
KviImageDialog * d = new KviImageDialog(this,QString(),KID_TYPE_ALL,KID_TYPE_FULL_PATH);
@@ -396,7 +396,7 @@ void KviSingleActionEditor::chooseBigIcon()
displayBigIcon(s);
}
-void KviSingleActionEditor::setActionData(KviActionData * d)
+void SingleActionEditor::setActionData(ActionData * d)
{
m_pActionData = d;
@@ -405,7 +405,7 @@ void KviSingleActionEditor::setActionData(KviActionData * d)
unsigned int uOldFlags = d->m_uFlags;
d->m_uFlags = KviAction::validateFlags(d->m_uFlags);
if(d->m_uFlags != uOldFlags)
- qDebug("invalid action flags in KviSingleActionEditor::setActionData(): %d fixed to %d",uOldFlags,d->m_uFlags);
+ qDebug("invalid action flags in SingleActionEditor::setActionData(): %d fixed to %d",uOldFlags,d->m_uFlags);
m_pNameEdit->setText(d->m_szName);
m_pNameEdit->setEnabled(true);
@@ -519,7 +519,7 @@ void KviSingleActionEditor::setActionData(KviActionData * d)
}
}
-void KviSingleActionEditor::commit()
+void SingleActionEditor::commit()
{
if(!m_pActionData)return;
@@ -581,11 +581,11 @@ void KviSingleActionEditor::commit()
unsigned int uOldFlags = m_pActionData->m_uFlags;
m_pActionData->m_uFlags = KviAction::validateFlags(m_pActionData->m_uFlags);
if(m_pActionData->m_uFlags != uOldFlags)
- qDebug("invalid action flags in KviSingleActionEditor::commit(): %d fixed to %d",uOldFlags,m_pActionData->m_uFlags);
+ qDebug("invalid action flags in SingleActionEditor::commit(): %d fixed to %d",uOldFlags,m_pActionData->m_uFlags);
}
-KviActionEditorTreeView::KviActionEditorTreeView(QWidget * pParent)
+ActionEditorTreeView::ActionEditorTreeView(QWidget * pParent)
: QTreeWidget(pParent)
{
setColumnCount (1);
@@ -599,11 +599,11 @@ KviActionEditorTreeView::KviActionEditorTreeView(QWidget * pParent)
}
-KviActionEditorTreeView::~KviActionEditorTreeView()
+ActionEditorTreeView::~ActionEditorTreeView()
{
}
-void KviActionEditorTreeView::resizeEvent(QResizeEvent * e)
+void ActionEditorTreeView::resizeEvent(QResizeEvent * e)
{
QTreeWidget::resizeEvent(e);
int iWidth = viewport()->width();
@@ -612,7 +612,7 @@ void KviActionEditorTreeView::resizeEvent(QResizeEvent * e)
}
-KviActionEditor::KviActionEditor(QWidget * par)
+ActionEditor::ActionEditor(QWidget * par)
: QWidget(par)
{
@@ -623,7 +623,7 @@ KviActionEditor::KviActionEditor(QWidget * par)
KviTalVBox * box = new KviTalVBox(m_pSplitter);
- m_pTreeWidget = new KviActionEditorTreeView(box);
+ m_pTreeWidget = new ActionEditorTreeView(box);
KviTalIconAndRichTextItemDelegate *itemDelegate=new KviTalIconAndRichTextItemDelegate(m_pTreeWidget);
m_pTreeWidget->setItemDelegate(itemDelegate);
//m_pTreeWidget->setShowSortIndicator(true);
@@ -641,17 +641,17 @@ KviActionEditor::KviActionEditor(QWidget * par)
box->setSpacing(1);
- m_pSingleActionEditor = new KviSingleActionEditor(m_pSplitter,this);
+ m_pSingleActionEditor = new SingleActionEditor(m_pSplitter,this);
- KviActionEditorTreeWidgetItem * last = 0;
- KviActionEditorTreeWidgetItem * first = 0;
+ ActionEditorTreeWidgetItem * last = 0;
+ ActionEditorTreeWidgetItem * first = 0;
KviPointerHashTableIterator<QString,KviAction> it(*(KviActionManager::instance()->actions()));
while(KviAction * a = it.current())
{
if(a->isKviUserActionNeverOverrideThis())
{
- KviActionData * ad = new KviActionData(
+ ActionData * ad = new ActionData(
a->name(),
((KviKvsUserAction *)a)->scriptCode(),
((KviKvsUserAction *)a)->visibleNameCode(),
@@ -663,7 +663,7 @@ KviActionEditor::KviActionEditor(QWidget * par)
a->keySequence(),
0
);
- KviActionEditorTreeWidgetItem * lvi = new KviActionEditorTreeWidgetItem(m_pTreeWidget,ad);
+ ActionEditorTreeWidgetItem * lvi = new ActionEditorTreeWidgetItem(m_pTreeWidget,ad);
ad->m_pItem = lvi;
if(ad->m_szName == g_szLastEditedAction)
last = lvi;
@@ -685,11 +685,11 @@ KviActionEditor::KviActionEditor(QWidget * par)
}
-KviActionEditor::~KviActionEditor()
+ActionEditor::~ActionEditor()
{
}
-void KviActionEditor::exportActions()
+void ActionEditor::exportActions()
{
QString szName = QDir::homePath();
if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
@@ -705,7 +705,7 @@ void KviActionEditor::exportActions()
{
if(m_pTreeWidget->topLevelItem(i)->isSelected())
{
- KviActionData * a = ((KviActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->actionData();
+ ActionData * a = ((ActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->actionData();
KviKvsUserAction::exportToKvs(
szCode,
@@ -728,15 +728,15 @@ void KviActionEditor::exportActions()
}
}
-void KviActionEditor::deleteActions()
+void ActionEditor::deleteActions()
{
- KviPointerList<KviActionEditorTreeWidgetItem> l;
+ KviPointerList<ActionEditorTreeWidgetItem> l;
l.setAutoDelete(false);
for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
{
if(m_pTreeWidget->topLevelItem(i)->isSelected())
- l.append((KviActionEditorTreeWidgetItem * )m_pTreeWidget->topLevelItem(i));
+ l.append((ActionEditorTreeWidgetItem * )m_pTreeWidget->topLevelItem(i));
}
if(l.isEmpty())return;
@@ -744,7 +744,7 @@ void KviActionEditor::deleteActions()
//if(QMessageBox::question(this,__tr2qs_ctx("Confirm Deletion","editor"),__tr2qs_ctx("Do you really want to delete the selected actions ?","editor"),__tr2qs_ctx("Yes","editor"),__tr2qs_ctx("No","editor")) != 0)
// return;
- for(KviActionEditorTreeWidgetItem * i = l.first();i;i = l.next())
+ for(ActionEditorTreeWidgetItem * i = l.first();i;i = l.next())
{
if(m_pSingleActionEditor->actionData() == i->actionData())
m_pSingleActionEditor->setActionData(0);
@@ -753,7 +753,7 @@ void KviActionEditor::deleteActions()
}
-QString KviActionEditor::nameForAutomaticAction(const QString &szTemplate)
+QString ActionEditor::nameForAutomaticAction(const QString &szTemplate)
{
QString ret;
QString szT = szTemplate;
@@ -769,7 +769,7 @@ QString KviActionEditor::nameForAutomaticAction(const QString &szTemplate)
return ret;
}
-void KviActionEditor::newAction()
+void ActionEditor::newAction()
{
QString szName = nameForAutomaticAction(__tr2qs_ctx("My Action","editor"));
QString szVis = __tr2qs_ctx("My Action","editor");
@@ -780,7 +780,7 @@ void KviActionEditor::newAction()
szDes.prepend("$tr(\"");
szDes.append("\")");
- KviActionData * ad = new KviActionData(szName,
+ ActionData * ad = new ActionData(szName,
QString(),
szVis,
szDes,
@@ -791,29 +791,29 @@ void KviActionEditor::newAction()
QString(),
0);
- KviActionEditorTreeWidgetItem * lvi = new KviActionEditorTreeWidgetItem(m_pTreeWidget,ad);
+ ActionEditorTreeWidgetItem * lvi = new ActionEditorTreeWidgetItem(m_pTreeWidget,ad);
ad->m_pItem = lvi;
m_pTreeWidget->setCurrentItem(lvi);
currentItemChanged(lvi,lvi);
}
-bool KviActionEditor::actionExists(const QString &szName)
+bool ActionEditor::actionExists(const QString &szName)
{
for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
{
- if(((KviActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->actionData()->m_szName == szName)return true;
+ if(((ActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->actionData()->m_szName == szName)return true;
}
return false;
}
-void KviActionEditor::currentItemChanged(QTreeWidgetItem * i,QTreeWidgetItem *)
+void ActionEditor::currentItemChanged(QTreeWidgetItem * i,QTreeWidgetItem *)
{
if(m_pSingleActionEditor->actionData())
m_pSingleActionEditor->commit();
m_pTreeWidget->update();
- KviActionEditorTreeWidgetItem * it = (KviActionEditorTreeWidgetItem *)i;
+ ActionEditorTreeWidgetItem * it = (ActionEditorTreeWidgetItem *)i;
if(!it)
{
m_pSingleActionEditor->setActionData(0);
@@ -830,7 +830,7 @@ void KviActionEditor::currentItemChanged(QTreeWidgetItem * i,QTreeWidgetItem *)
g_szLastEditedAction = it->actionData()->m_szName;
}
-void KviActionEditor::commit()
+void ActionEditor::commit()
{
m_pSingleActionEditor->commit();
@@ -840,7 +840,7 @@ void KviActionEditor::commit()
for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
{
- KviActionEditorTreeWidgetItem * it = (KviActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+ ActionEditorTreeWidgetItem * it = (ActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
KviKvsUserAction * a = KviKvsUserAction::createInstance( // msvc workaround
KviActionManager::instance(),
it->actionData()->m_szName,
@@ -860,7 +860,7 @@ void KviActionEditor::commit()
}
-KviActionEditorWindow::KviActionEditorWindow(KviMainWindow * lpFrm)
+ActionEditorWindow::ActionEditorWindow(KviMainWindow * lpFrm)
: KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"actioneditor",0)
{
g_pActionEditorWindow = this;
@@ -868,7 +868,7 @@ KviActionEditorWindow::KviActionEditorWindow(KviMainWindow * lpFrm)
QGridLayout * g = new QGridLayout();
- m_pEditor = new KviActionEditor(this);
+ m_pEditor = new ActionEditor(this);
g->addWidget(m_pEditor,0,0,1,4);
QPushButton * btn = new QPushButton(__tr2qs_ctx("OK","editor"),this);
@@ -891,44 +891,44 @@ KviActionEditorWindow::KviActionEditorWindow(KviMainWindow * lpFrm)
setLayout(g);
}
-KviActionEditorWindow::~KviActionEditorWindow()
+ActionEditorWindow::~ActionEditorWindow()
{
g_pActionEditorWindow = 0;
}
-void KviActionEditorWindow::okClicked()
+void ActionEditorWindow::okClicked()
{
m_pEditor->commit();
close();
}
-void KviActionEditorWindow::applyClicked()
+void ActionEditorWindow::applyClicked()
{
m_pEditor->commit();
}
-void KviActionEditorWindow::cancelClicked()
+void ActionEditorWindow::cancelClicked()
{
close();
}
-QPixmap * KviActionEditorWindow::myIconPtr()
+QPixmap * ActionEditorWindow::myIconPtr()
{
return g_pIconManager->getSmallIcon(KVI_SMALLICON_SCRIPTACTION);
}
-void KviActionEditorWindow::getConfigGroupName(QString &szName)
+void ActionEditorWindow::getConfigGroupName(QString &szName)
{
szName = "actioneditor";
}
-void KviActionEditorWindow::saveProperties(KviConfigurationFile *cfg)
+void ActionEditorWindow::saveProperties(KviConfigurationFile *cfg)
{
KviWindow::saveProperties(cfg);
cfg->writeEntry("Splitter",m_pEditor->m_pSplitter->sizes());
}
-void KviActionEditorWindow::loadProperties(KviConfigurationFile *cfg)
+void ActionEditorWindow::loadProperties(KviConfigurationFile *cfg)
{
int w = width();
KviWindow::loadProperties(cfg);
diff --git a/src/modules/actioneditor/actioneditor.h b/src/modules/actioneditor/ActionEditor.h
index 0de966c1b..ac05ec216 100644
--- a/src/modules/actioneditor/actioneditor.h
+++ b/src/modules/actioneditor/ActionEditor.h
@@ -2,7 +2,7 @@
#define _ACTIONEDITOR_H_
//=============================================================================
//
-// File : actioneditor.h
+// File : ActionEditor.h
// Creation date : Tue Dec 29 2004 02:40:55 CEST by Szymon Stefanek
//
// This file is part of the KVIrc irc client distribution
@@ -38,12 +38,12 @@ class QComboBox;
class QSimpleRichText;
class QPushButton;
class QSplitter;
-class KviActionEditorTreeWidgetItem;
+class ActionEditorTreeWidgetItem;
class KviScriptEditor;
-class KviActionEditor;
+class ActionEditor;
-class KviActionData
+class ActionData
{
public:
QString m_szName;
@@ -55,9 +55,9 @@ public:
QString m_szSmallIcon;
QString m_szKeySequence;
unsigned int m_uFlags;
- KviActionEditorTreeWidgetItem * m_pItem; // ummigarba tanto...
+ ActionEditorTreeWidgetItem * m_pItem; // ummigarba tanto...
public:
- KviActionData(const QString &szName,
+ ActionData(const QString &szName,
const QString &szScriptCode,
const QString &szVisibleName,
const QString &szDescription,
@@ -66,7 +66,7 @@ public:
const QString &szSmallIcon,
unsigned int uFlags,
const QString &szKeySequence,
- KviActionEditorTreeWidgetItem * pItem)
+ ActionEditorTreeWidgetItem * pItem)
: m_szName(szName), m_szScriptCode(szScriptCode), m_szVisibleName(szVisibleName),
m_szDescription(szDescription), m_szCategory(szCategory), m_szBigIcon(szBigIcon),
m_szSmallIcon(szSmallIcon), m_szKeySequence(szKeySequence), m_uFlags(uFlags),
@@ -75,20 +75,20 @@ public:
};
-class KviActionEditorTreeWidgetItem : public QTreeWidgetItem
+class ActionEditorTreeWidgetItem : public QTreeWidgetItem
{
public:
- KviActionEditorTreeWidgetItem(QTreeWidget * v,KviActionData * a);
- ~KviActionEditorTreeWidgetItem();
+ ActionEditorTreeWidgetItem(QTreeWidget * v,ActionData * a);
+ ~ActionEditorTreeWidgetItem();
protected:
- KviActionData * m_pActionData;
+ ActionData * m_pActionData;
//QSimpleRichText * m_pText;
QTextDocument * m_pText;
QPixmap * m_pIcon;
QTreeWidget * m_pTreeWidget;
QString m_szKey;
public:
- KviActionData * actionData(){ return m_pActionData; };
+ ActionData * actionData(){ return m_pActionData; };
//void setupForActionData();
public:
//virtual void paintCell(QPainter * p,const QColorGroup & cg,int column,int width,int align);
@@ -97,26 +97,26 @@ public:
};
-class KviActionEditorTreeView : public QTreeWidget
+class ActionEditorTreeView : public QTreeWidget
{
Q_OBJECT
public:
- KviActionEditorTreeView(QWidget * pParent);
- ~KviActionEditorTreeView();
+ ActionEditorTreeView(QWidget * pParent);
+ ~ActionEditorTreeView();
protected:
virtual void resizeEvent(QResizeEvent * e);
};
-class KviSingleActionEditor : public QWidget
+class SingleActionEditor : public QWidget
{
Q_OBJECT
public:
- KviSingleActionEditor(QWidget * par,KviActionEditor * ed);
- ~KviSingleActionEditor();
+ SingleActionEditor(QWidget * par,ActionEditor * ed);
+ ~SingleActionEditor();
protected:
- KviActionEditor * m_pActionEditor;
- KviActionData * m_pActionData;
+ ActionEditor * m_pActionEditor;
+ ActionData * m_pActionData;
QLineEdit * m_pNameEdit;
QLineEdit * m_pVisibleNameEdit;
QComboBox * m_pCategoryCombo;
@@ -139,8 +139,8 @@ protected:
QCheckBox * m_pChannelOnlyIfUsersSelectedCheck;
QCheckBox * m_pQueryOnlyIfUsersSelectedCheck;
public:
- KviActionData * actionData(){ return m_pActionData; };
- void setActionData(KviActionData * d);
+ ActionData * actionData(){ return m_pActionData; };
+ void setActionData(ActionData * d);
void commit();
protected slots:
void chooseSmallIcon();
@@ -154,16 +154,16 @@ protected slots:
};
-class KviActionEditor : public QWidget
+class ActionEditor : public QWidget
{
- friend class KviActionEditorWindow;
+ friend class ActionEditorWindow;
Q_OBJECT
public:
- KviActionEditor(QWidget * par);
- ~KviActionEditor();
+ ActionEditor(QWidget * par);
+ ~ActionEditor();
protected:
- KviActionEditorTreeView * m_pTreeWidget;
- KviSingleActionEditor * m_pSingleActionEditor;
+ ActionEditorTreeView * m_pTreeWidget;
+ SingleActionEditor * m_pSingleActionEditor;
QSplitter * m_pSplitter;
QPushButton * m_pNewActionButton;
QPushButton * m_pDeleteActionsButton;
@@ -182,14 +182,14 @@ protected slots:
};
-class KviActionEditorWindow : public KviWindow
+class ActionEditorWindow : public KviWindow
{
Q_OBJECT
public:
- KviActionEditorWindow(KviMainWindow * lpFrm);
- ~KviActionEditorWindow();
+ ActionEditorWindow(KviMainWindow * lpFrm);
+ ~ActionEditorWindow();
protected:
- KviActionEditor * m_pEditor;
+ ActionEditor * m_pEditor;
protected:
virtual QPixmap * myIconPtr();
virtual void getConfigGroupName(QString &szName);
diff --git a/src/modules/actioneditor/CMakeLists.txt b/src/modules/actioneditor/CMakeLists.txt
index a3fb5c56c..15efd644d 100644
--- a/src/modules/actioneditor/CMakeLists.txt
+++ b/src/modules/actioneditor/CMakeLists.txt
@@ -1,11 +1,11 @@
# CMakeLists for src/modules/actioneditor
SET(kviactioneditor_MOC_HDRS
- actioneditor.h
+ ActionEditor.h
)
SET(kviactioneditor_SRCS
- actioneditor.cpp
+ ActionEditor.cpp
libkviactioneditor.cpp
)
diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp
index 748a11217..aab1f7835 100644
--- a/src/modules/actioneditor/libkviactioneditor.cpp
+++ b/src/modules/actioneditor/libkviactioneditor.cpp
@@ -22,13 +22,13 @@
//
//=============================================================================
-#include "actioneditor.h"
+#include "ActionEditor.h"
#include "KviModule.h"
#include "KviLocale.h"
#include "KviMainWindow.h"
-KviActionEditorWindow * g_pActionEditorWindow = 0;
+ActionEditorWindow * g_pActionEditorWindow = 0;
/*
@@ -49,7 +49,7 @@ static bool actioneditor_kvs_cmd_open(KviKvsModuleCommandCall * c)
{
if(!g_pActionEditorWindow)
{
- g_pActionEditorWindow = new KviActionEditorWindow(c->window()->frame());
+ g_pActionEditorWindow = new ActionEditorWindow(c->window()->frame());
c->window()->frame()->addWindow(g_pActionEditorWindow);
}