aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/classeditor
diff options
context:
space:
mode:
authorGravatar Szymon Tomasz Stefanek2010-12-25 05:28:46 +0000
committerGravatar Szymon Tomasz Stefanek2010-12-25 05:28:46 +0000
commitf2f47c5eaa7d284abad1f693d7c75c85c42565df (patch)
tree2dd141a4ae4911ef3a1abf4d1910d3f7ba071c27 /src/modules/classeditor
parentMore work on the window popup (diff)
downloadKVIrc-f2f47c5eaa7d284abad1f693d7c75c85c42565df.tar.gz
KVIrc-f2f47c5eaa7d284abad1f693d7c75c85c42565df.tar.bz2
KVIrc-f2f47c5eaa7d284abad1f693d7c75c85c42565df.zip
Beginning of 'the big rename & cleanup'. File names should match class names, when possible. Move classes to one per file. Move C functions to namespaces, if possible. Kill some abbreviations...
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5229 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/classeditor')
-rw-r--r--src/modules/classeditor/classeditor.cpp30
-rw-r--r--src/modules/classeditor/classeditor.h14
-rw-r--r--src/modules/classeditor/libkviclasseditor.cpp2
3 files changed, 23 insertions, 23 deletions
diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/classeditor.cpp
index 3f34c0b9e..6c0e59ea2 100644
--- a/src/modules/classeditor/classeditor.cpp
+++ b/src/modules/classeditor/classeditor.cpp
@@ -27,21 +27,21 @@
#include "kvi_iconmanager.h"
#include "kvi_options.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
#include "kvi_imagedialog.h"
-#include "kvi_config.h"
+#include "KviConfigurationFile.h"
#include "kvi_filedialog.h"
-#include "kvi_fileutils.h"
+#include "KviFileUtils.h"
#include "kvi_scripteditor.h"
#include "kvi_debug.h"
#include "kvi_app.h"
#include "kvi_frame.h"
-#include "kvi_qstring.h"
+#include "KviQString.h"
#include "kvi_kvs_kernel.h"
#include "kvi_kvs_object_class.h"
#include "kvi_kvs_object_controller.h"
#include "kvi_filedialog.h"
-#include "kvi_cmdformatter.h"
+#include "KviCommandFormatter.h"
#include "kvi_module.h"
#include "kvi_tal_vbox.h"
#include "kvi_fileextensions.h"
@@ -1222,7 +1222,7 @@ void KviClassEditor::exportClasses(bool bSelectedOnly, bool bSingleFiles)
}
}
-void KviClassEditor::saveProperties(KviConfig * pCfg)
+void KviClassEditor::saveProperties(KviConfigurationFile * pCfg)
{
pCfg->writeEntry("Sizes",m_pSplitter->sizes());
QString szName;
@@ -1231,7 +1231,7 @@ void KviClassEditor::saveProperties(KviConfig * pCfg)
pCfg->writeEntry("LastClass",szName);
}
-void KviClassEditor::loadProperties(KviConfig * pCfg)
+void KviClassEditor::loadProperties(KviConfigurationFile * pCfg)
{
QList<int> def;
def.append(20);
@@ -1704,7 +1704,7 @@ void KviClassEditor::build()
QString szFileName = "libkviclasseditortmp.kvc";
QString szBuffer;
g_pApp->getLocalKvircDirectory(szBuffer,KviApp::ConfigPlugins,szFileName);
- KviConfig cfg(szBuffer,KviConfig::Write);
+ KviConfigurationFile cfg(szBuffer,KviConfigurationFile::Write);
cfg.clear();
cfg.sync();
}
@@ -1716,8 +1716,8 @@ void KviClassEditor::loadNotBuiltClasses()
QString szFileName = "libkviclasseditortmp.kvc";
QString szBuffer;
g_pApp->getLocalKvircDirectory(szBuffer,KviApp::ConfigPlugins,szFileName);
- KviConfig cfg(szBuffer,KviConfig::Read);
- KviConfigIterator it(*(cfg.dict()));
+ KviConfigurationFile cfg(szBuffer,KviConfigurationFile::Read);
+ KviConfigurationFileIterator it(*(cfg.dict()));
KviPointerList<QString> l;
l.setAutoDelete(true);
@@ -1734,10 +1734,10 @@ void KviClassEditor::loadNotBuiltClasses()
KviClassEditorTreeWidgetItem * pClassItem = createFullItem(*pszTmp);
m_pClasses->insert(*pszTmp,pClassItem);
pClassItem->setClassNotBuilt(true);
- KviConfigGroup * pDict = cfg.dict()->find(*pszTmp);
+ KviConfigurationFileGroup * pDict = cfg.dict()->find(*pszTmp);
if(pDict)
{
- KviConfigGroupIterator it(*pDict);
+ KviConfigurationFileGroupIterator it(*pDict);
KviPointerList<QString> names;
names.setAutoDelete(true);
while(it.current())
@@ -1775,7 +1775,7 @@ void KviClassEditor::saveNotBuiltClasses()
QString szFileName = "libkviclasseditortmp.kvc";
QString szBuffer;
g_pApp->getLocalKvircDirectory(szBuffer,KviApp::ConfigPlugins,szFileName);
- KviConfig cfg(szBuffer,KviConfig::Write);
+ KviConfigurationFile cfg(szBuffer,KviConfigurationFile::Write);
cfg.clear();
while(it.current())
@@ -1877,12 +1877,12 @@ void KviClassEditorWindow::configGroupName(QString &szName)
szName = "classeditor";
}
-void KviClassEditorWindow::saveProperties(KviConfig * pCfg)
+void KviClassEditorWindow::saveProperties(KviConfigurationFile * pCfg)
{
m_pEditor->saveProperties(pCfg);
}
-void KviClassEditorWindow::loadProperties(KviConfig * pCfg)
+void KviClassEditorWindow::loadProperties(KviConfigurationFile * pCfg)
{
m_pEditor->loadProperties(pCfg);
}
diff --git a/src/modules/classeditor/classeditor.h b/src/modules/classeditor/classeditor.h
index 21c5589ba..b1418cdcc 100644
--- a/src/modules/classeditor/classeditor.h
+++ b/src/modules/classeditor/classeditor.h
@@ -31,10 +31,10 @@
*/
#include "kvi_window.h"
-#include "kvi_string.h"
-#include "kvi_pointerlist.h"
+#include "KviCString.h"
+#include "KviPointerList.h"
#include "kvi_tal_popupmenu.h"
-#include "kvi_heapobject.h"
+#include "KviHeapObject.h"
#include "kvi_kvs_object_class.h"
#include <QWidget>
@@ -298,14 +298,14 @@ public:
* \param pCfg The configuration file
* \return void
*/
- virtual void saveProperties(KviConfig * pCfg);
+ virtual void saveProperties(KviConfigurationFile * pCfg);
/**
* \brief Called to load the window properties
* \param pCfg The configuration file
* \return void
*/
- virtual void loadProperties(KviConfig * pCfg);
+ virtual void loadProperties(KviConfigurationFile * pCfg);
/**
* \brief Builds the class!
@@ -505,14 +505,14 @@ protected:
* \param pCfg The configuration file
* \return void
*/
- virtual void saveProperties(KviConfig * pCfg);
+ virtual void saveProperties(KviConfigurationFile * pCfg);
/**
* \brief Called to load the window properties
* \param pCfg The configuration file
* \return void
*/
- virtual void loadProperties(KviConfig * pCfg);
+ virtual void loadProperties(KviConfigurationFile * pCfg);
protected slots:
/**
* \brief Called when we click the cancel button
diff --git a/src/modules/classeditor/libkviclasseditor.cpp b/src/modules/classeditor/libkviclasseditor.cpp
index 94564c88d..d80c3b64d 100644
--- a/src/modules/classeditor/libkviclasseditor.cpp
+++ b/src/modules/classeditor/libkviclasseditor.cpp
@@ -25,7 +25,7 @@
#include "classeditor.h"
#include "kvi_module.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
#include "kvi_frame.h"