aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects
diff options
context:
space:
mode:
authorGravatar Szymon Tomasz Stefanek2010-12-27 05:02:48 +0000
committerGravatar Szymon Tomasz Stefanek2010-12-27 05:02:48 +0000
commit075bdcd93cf7882bad4cb027adf159f93674d6e5 (patch)
treeae06173bd9e8e2db71cced8a9ebad214607d7f9a /src/modules/objects
parentYet more renaming and cleanup (diff)
downloadKVIrc-075bdcd93cf7882bad4cb027adf159f93674d6e5.tar.gz
KVIrc-075bdcd93cf7882bad4cb027adf159f93674d6e5.tar.bz2
KVIrc-075bdcd93cf7882bad4cb027adf159f93674d6e5.zip
More renaming and cleanup
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5237 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/objects')
-rw-r--r--src/modules/objects/class_button.cpp2
-rw-r--r--src/modules/objects/class_buttongroup.cpp2
-rw-r--r--src/modules/objects/class_datetimeedit.cpp2
-rw-r--r--src/modules/objects/class_dialog.cpp4
-rw-r--r--src/modules/objects/class_dockwindow.cpp2
-rw-r--r--src/modules/objects/class_groupbox.cpp2
-rw-r--r--src/modules/objects/class_label.cpp2
-rw-r--r--src/modules/objects/class_lcd.cpp2
-rw-r--r--src/modules/objects/class_list.h2
-rw-r--r--src/modules/objects/class_listwidget.cpp2
-rw-r--r--src/modules/objects/class_mainwindow.cpp2
-rw-r--r--src/modules/objects/class_painter.cpp2
-rw-r--r--src/modules/objects/class_popupmenu.cpp2
-rw-r--r--src/modules/objects/class_progressbar.cpp2
-rw-r--r--src/modules/objects/class_radiobutton.cpp2
-rw-r--r--src/modules/objects/class_slider.cpp2
-rw-r--r--src/modules/objects/class_spinbox.cpp2
-rw-r--r--src/modules/objects/class_sql.h2
-rw-r--r--src/modules/objects/class_tablewidget.cpp6
-rw-r--r--src/modules/objects/class_tablewidget.h2
-rw-r--r--src/modules/objects/class_tabwidget.cpp2
-rw-r--r--src/modules/objects/class_tbrowser.cpp2
-rw-r--r--src/modules/objects/class_toolbar.cpp2
-rw-r--r--src/modules/objects/class_toolbutton.cpp2
-rw-r--r--src/modules/objects/class_trayicon.cpp2
-rw-r--r--src/modules/objects/class_treewidget.cpp2
-rw-r--r--src/modules/objects/class_treewidgetitem.cpp2
-rw-r--r--src/modules/objects/class_widget.cpp10
-rw-r--r--src/modules/objects/class_window.cpp4
-rw-r--r--src/modules/objects/class_window.h4
-rw-r--r--src/modules/objects/class_workspace.cpp2
-rw-r--r--src/modules/objects/class_wrapper.cpp22
-rw-r--r--src/modules/objects/class_xmlreader.cpp4
-rw-r--r--src/modules/objects/libkviobjects.cpp12
-rw-r--r--src/modules/objects/object_macros.h10
35 files changed, 64 insertions, 64 deletions
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp
index 539217a34..6b276641f 100644
--- a/src/modules/objects/class_button.cpp
+++ b/src/modules/objects/class_button.cpp
@@ -26,7 +26,7 @@
#include "kvi_debug.h"
#include "KviLocale.h"
#include "KviError.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include "KviFile.h"
#include "class_button.h"
diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp
index 3c2aadf14..cc4d2b28c 100644
--- a/src/modules/objects/class_buttongroup.cpp
+++ b/src/modules/objects/class_buttongroup.cpp
@@ -28,7 +28,7 @@
#include "KviError.h"
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include <QButtonGroup>
#include <QRadioButton>
diff --git a/src/modules/objects/class_datetimeedit.cpp b/src/modules/objects/class_datetimeedit.cpp
index 41a2f6e26..4ae6e7563 100644
--- a/src/modules/objects/class_datetimeedit.cpp
+++ b/src/modules/objects/class_datetimeedit.cpp
@@ -25,7 +25,7 @@
#include "kvi_debug.h"
#include "KviLocale.h"
#include "KviError.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include "KviFile.h"
#include "class_datetimeedit.h"
diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp
index bf9834a03..554d882bb 100644
--- a/src/modules/objects/class_dialog.cpp
+++ b/src/modules/objects/class_dialog.cpp
@@ -26,8 +26,8 @@
#include "KviError.h"
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_frame.h"
-#include "kvi_app.h"
+#include "KviMainWindow.h"
+#include "KviApplication.h"
#include <QDialog>
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index d4cd121e6..bce939af9 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -24,7 +24,7 @@
#include "class_dockwindow.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
#include "KviLocale.h"
#include "KviQString.h"
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index c7e684de1..5f3cfdaa6 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -29,7 +29,7 @@
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
// Tables used in $setAlignment, $alignment and in $setOrientation & $orientation
diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
index 821afc6b2..f47510509 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/class_label.cpp
@@ -27,7 +27,7 @@
#include "kvi_debug.h"
#include "class_label.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include <QFont>
#include <QPixmap>
diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp
index 36f675dce..ab7295c6e 100644
--- a/src/modules/objects/class_lcd.cpp
+++ b/src/modules/objects/class_lcd.cpp
@@ -27,7 +27,7 @@
#include "KviError.h"
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include <QLCDNumber>
diff --git a/src/modules/objects/class_list.h b/src/modules/objects/class_list.h
index 6354f74fe..b0508160b 100644
--- a/src/modules/objects/class_list.h
+++ b/src/modules/objects/class_list.h
@@ -27,7 +27,7 @@
#include "kvi_settings.h"
#include "KviCString.h"
#include "KviPointerList.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsVariant.h"
#include "object_macros.h"
diff --git a/src/modules/objects/class_listwidget.cpp b/src/modules/objects/class_listwidget.cpp
index 19e698a28..986a976de 100644
--- a/src/modules/objects/class_listwidget.cpp
+++ b/src/modules/objects/class_listwidget.cpp
@@ -28,7 +28,7 @@
#include "class_list.h"
#include "class_listwidget.h"
#include "class_pixmap.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include <QListWidget>
const int item_flags[] = {
diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp
index 76d278c6d..992121bfb 100644
--- a/src/modules/objects/class_mainwindow.cpp
+++ b/src/modules/objects/class_mainwindow.cpp
@@ -28,7 +28,7 @@
#include "KviError.h"
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
/*
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index e2a392b08..acaaf15a9 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -31,7 +31,7 @@
#include "kvi_debug.h"
#include "KviLocale.h"
#include "KviError.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include "KviMemory.h"
#include <QPrintDialog>
#include <QTextDocument>
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index f9c87722c..42d6bf0af 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -29,7 +29,7 @@
#include "KviError.h"
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include "KviTalPopupMenu.h"
#include <QCursor>
diff --git a/src/modules/objects/class_progressbar.cpp b/src/modules/objects/class_progressbar.cpp
index 31588f0ae..7fa0a149a 100644
--- a/src/modules/objects/class_progressbar.cpp
+++ b/src/modules/objects/class_progressbar.cpp
@@ -28,7 +28,7 @@
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include <QProgressBar>
diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp
index 442e32558..53ec38286 100644
--- a/src/modules/objects/class_radiobutton.cpp
+++ b/src/modules/objects/class_radiobutton.cpp
@@ -27,7 +27,7 @@
#include "KviError.h"
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include <QRadioButton>
/*
diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp
index 07dc6f82e..45e8e6c25 100644
--- a/src/modules/objects/class_slider.cpp
+++ b/src/modules/objects/class_slider.cpp
@@ -27,7 +27,7 @@
#include "KviError.h"
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include <QSlider>
diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp
index 16d27b85e..6c269c338 100644
--- a/src/modules/objects/class_spinbox.cpp
+++ b/src/modules/objects/class_spinbox.cpp
@@ -27,7 +27,7 @@
#include "KviError.h"
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include <QSpinBox>
/*
diff --git a/src/modules/objects/class_sql.h b/src/modules/objects/class_sql.h
index 2b848ca97..bf79e615e 100644
--- a/src/modules/objects/class_sql.h
+++ b/src/modules/objects/class_sql.h
@@ -27,7 +27,7 @@
#include "kvi_settings.h"
#include "KviCString.h"
#include "KviPointerList.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsVariant.h"
#include "object_macros.h"
#include <QtSql>
#include <QHash>
diff --git a/src/modules/objects/class_tablewidget.cpp b/src/modules/objects/class_tablewidget.cpp
index b74825c49..a12c323de 100644
--- a/src/modules/objects/class_tablewidget.cpp
+++ b/src/modules/objects/class_tablewidget.cpp
@@ -27,12 +27,12 @@
#include "class_pixmap.h"
#include "kvi_debug.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
#include "KviLocale.h"
#include "KviError.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include "KviFile.h"
-#include "kvi_kvs_arraycast.h"
+#include "KviKvsArrayCast.h"
#include <QTableWidget>
#include <QHeaderView>
diff --git a/src/modules/objects/class_tablewidget.h b/src/modules/objects/class_tablewidget.h
index 9b76fbdcb..12fdabb6e 100644
--- a/src/modules/objects/class_tablewidget.h
+++ b/src/modules/objects/class_tablewidget.h
@@ -28,7 +28,7 @@
#include "class_widget.h"
#include "object_macros.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsRunTimeContext.h"
#include <QtSql>
#include <QTableWidgetItem>
diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp
index 000f22b03..befb18c92 100644
--- a/src/modules/objects/class_tabwidget.cpp
+++ b/src/modules/objects/class_tabwidget.cpp
@@ -27,7 +27,7 @@
#include "KviError.h"
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include <QTabWidget>
diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp
index b0fc19ab0..d7dc686cc 100644
--- a/src/modules/objects/class_tbrowser.cpp
+++ b/src/modules/objects/class_tbrowser.cpp
@@ -28,7 +28,7 @@
#include "KviError.h"
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include <QTextBrowser>
#include <QFile>
diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp
index e3927da9d..774cbd749 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/class_toolbar.cpp
@@ -29,7 +29,7 @@
#include "KviTalToolBar.h"
#include "KviTalMainWindow.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include "class_mainwindow.h"
/*
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index 3d1eb5fda..e09dc1186 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -28,7 +28,7 @@
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include "KviTalPopupMenu.h"
/*
@doc: toolbutton
diff --git a/src/modules/objects/class_trayicon.cpp b/src/modules/objects/class_trayicon.cpp
index 9463230ba..5aced0d64 100644
--- a/src/modules/objects/class_trayicon.cpp
+++ b/src/modules/objects/class_trayicon.cpp
@@ -24,7 +24,7 @@
#include "class_trayicon.h"
#include "class_popupmenu.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include "kvi_debug.h"
#include "KviError.h"
#include "KviLocale.h"
diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp
index 34e7bb837..027f5fe62 100644
--- a/src/modules/objects/class_treewidget.cpp
+++ b/src/modules/objects/class_treewidget.cpp
@@ -28,7 +28,7 @@
#include "KviError.h"
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include <QTreeWidget>
#include <QSqlDatabase>
diff --git a/src/modules/objects/class_treewidgetitem.cpp b/src/modules/objects/class_treewidgetitem.cpp
index 63922f1f5..51249b2ca 100644
--- a/src/modules/objects/class_treewidgetitem.cpp
+++ b/src/modules/objects/class_treewidgetitem.cpp
@@ -29,7 +29,7 @@
#include "KviError.h"
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include <QIcon>
const int item_flags[] = {
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 32006fefe..c98fd9540 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -30,11 +30,11 @@
#include "kvi_debug.h"
#include "KviError.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
-#include "kvi_window.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_statusbar.h"
+#include "KviIconManager.h"
+#include "KviWindow.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviStatusBar.h"
#include "class_painter.h"
#include <QKeyEvent>
diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp
index 2988ff28a..999235b5d 100644
--- a/src/modules/objects/class_window.cpp
+++ b/src/modules/objects/class_window.cpp
@@ -29,11 +29,11 @@
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
-KviKvsScriptWindowWindow::KviKvsScriptWindowWindow(KviFrame * pParent,const QString &szName)
+KviKvsScriptWindowWindow::KviKvsScriptWindowWindow(KviMainWindow * pParent,const QString &szName)
: KviWindow(KVI_WINDOW_TYPE_SCRIPTOBJECT,pParent,szName)
{
m_pCentralWidget = 0;
diff --git a/src/modules/objects/class_window.h b/src/modules/objects/class_window.h
index 479f5d01a..8b130a9ad 100644
--- a/src/modules/objects/class_window.h
+++ b/src/modules/objects/class_window.h
@@ -25,7 +25,7 @@
//=============================================================================
#include "class_widget.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
#include "object_macros.h"
class KviKvsObject_window : public KviKvsObject_widget
@@ -48,7 +48,7 @@ class KviKvsScriptWindowWindow : public KviWindow
{
Q_OBJECT
public:
- KviKvsScriptWindowWindow(KviFrame * pParent,const QString &szName);
+ KviKvsScriptWindowWindow(KviMainWindow * pParent,const QString &szName);
~KviKvsScriptWindowWindow();
protected:
KviKvsObject_widget * m_pCentralWidgetObject;
diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/class_workspace.cpp
index d6f6b7262..a541d4e71 100644
--- a/src/modules/objects/class_workspace.cpp
+++ b/src/modules/objects/class_workspace.cpp
@@ -28,7 +28,7 @@
#include "KviError.h"
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include <QMdiArea>
#include <QMdiSubWindow>
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index d943621b6..9332ec828 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -28,12 +28,12 @@
#include "kvi_debug.h"
#include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
#include "class_widget.h"
#include <qwidget.h>
-#include "kvi_app.h"
-#include "kvi_frame.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
/*
@@ -61,37 +61,37 @@
The difference is that there are more toplevel widgets (and so more than one tree).[br]
You can use [fnc]$objects.dump()[/fnc] to take a look at the KVIrc Qt objects tree.[br]
Here is a part of the tree:[br][br]
- Ptr 14332520: top level object: kvirc_frame, class KviFrame, visible, rect = -4, -4, 1024, 708
+ Ptr 14332520: top level object: kvirc_frame, class KviMainWindow, visible, rect = -4, -4, 1024, 708
Ptr 17296024: object: qt_top_dock, class QDockArea
Ptr 14882136: object: qt_custom_toolbar, class KviCustomToolBar
Ptr 18143368: object: qt_dockwidget_internal, class QDockWindowTitleBar
[br][br]
Every listed widget has a "name", a "class" and a set of properties.[br]
- The first entry in this example is a KVIrc server window, class "KviFrame" and name "kvirc_frame":
+ The first entry in this example is a KVIrc server window, class "KviMainWindow" and name "kvirc_frame":
it is a toplevel widget.[br]
The "qt_top_dock", "qt_custom_toolbar" and the "qt_dockwidget_internal" are
direct children of that widget.[br]
To indicate a specific widget we will use the "class::name" form.[br]
- So to indicate the main KVIrc frame you will use "KviFrame::kvirc_main_frame".
+ So to indicate the main KVIrc frame you will use "KviMainWindow::kvirc_main_frame".
Look at this example:[br]
- %A=$new(wrapper,0,test,KviFrame::kvirc_frame,KviStatusBar::unnamed)[br]
+ %A=$new(wrapper,0,test,KviMainWindow::kvirc_frame,KviStatusBar::unnamed)[br]
%A->$setBackGroundColor(FFFFFF)[br]
For first thing we create an object type wrapper,then we flow the tree that there from the command /object.dump and we will have:[br]
. [br]
. [br]
- Ptr 14196288: top level object: kvirc_frame, class KviFrame, visible, rect = -4, -4, 1024, 712 [br]
+ Ptr 14196288: top level object: kvirc_frame, class KviMainWindow, visible, rect = -4, -4, 1024, 712 [br]
. [br]
Ptr 17197360: object: unnamed, class KviStatusBar [br]
. [br]
. [br]
- in this way we can follow the order, father->child from the top-level widget(KviFrame::kvirc_frame)[br]
+ in this way we can follow the order, father->child from the top-level widget(KviMainWindow::kvirc_frame)[br]
to reach the child that interests us (KviStatusBar::unnamed)[br]
Then, following the syntax we will have:
- %A=$new(wrapper,0,test,KviFrame::kvirc_frame,KviStatusBar::unnamed)
+ %A=$new(wrapper,0,test,KviMainWindow::kvirc_frame,KviStatusBar::unnamed)
Now %A. will be point to the wrapped object, therefore we could modify its property or to consider it as if it were an object created by us in scripting. [br]
Obviously, deleting the created object (for example %A) you don't will delete the object of Kvirc (in this case the statusbar). [br]
Another example could be this:[br]
- %A=$new(wrapper,0,test,KviFrame::kvirc_frame,QToolButton::kvirc.identityoptions)[br]
+ %A=$new(wrapper,0,test,KviMainWindow::kvirc_frame,QToolButton::kvirc.identityoptions)[br]
%A->$setProperty(usesBigPixmap,0)[br]
In this fool example with the function $setProperty, we has setted the property usesBigPixmap to False, making to become the small icons of the ToolBar.[br]
[br]
diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp
index f8eb6a5bb..07219359d 100644
--- a/src/modules/objects/class_xmlreader.cpp
+++ b/src/modules/objects/class_xmlreader.cpp
@@ -26,8 +26,8 @@
#include "class_memorybuffer.h"
#include "KviLocale.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_hash.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsHash.h"
#include "KviQString.h"
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 87ebcba25..f0be91446 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -71,17 +71,17 @@
#include "class_datetimeedit.h"
-#include "kvi_iconmanager.h"
-#include "kvi_window.h"
+#include "KviIconManager.h"
+#include "KviWindow.h"
#include "kvi_out.h"
#include "KviMircCntrl.h"
-#include "kvi_app.h"
-#include "kvi_module.h"
+#include "KviApplication.h"
+#include "KviModule.h"
#include "KviLocale.h"
#include "KviError.h"
#include "KviCommandFormatter.h"
#include "kvi_out.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
#include "KviFileUtils.h"
#include <QDir>
@@ -506,7 +506,7 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c)
++it;
}
QString szPath;
- g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes);
+ g_pApp->getLocalKvircDirectory(szPath,KviApplication::Classes);
QDir d(szPath);
QStringList sl;
sl = d.entryList(QDir::Files);
diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h
index 66bd57374..2f28aab2f 100644
--- a/src/modules/objects/object_macros.h
+++ b/src/modules/objects/object_macros.h
@@ -24,11 +24,11 @@
//
//=============================================================================
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_object.h"
-#include "kvi_kvs_object_class.h"
-#include "kvi_kvs_object_controller.h"
-#include "kvi_kvs_object_functioncall.h"
+#include "KviKvsKernel.h"
+#include "KviKvsObject.h"
+#include "KviKvsObjectClass.h"
+#include "KviKvsObjectController.h"
+#include "KviKvsObjectFunctionCall.h"
#define KVSO_DECLARE_OBJECT(__className) \
__className(KviKvsObjectClass * pClass,KviKvsObject * pParent,const QString &szName); \