diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-08 00:07:15 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-08 00:07:15 -0600 |
commit | a232b8a3234cb3d6c1ded204e520ed6d70669230 (patch) | |
tree | bda854c1713c0ae7d06568bf4f350dc41c459026 /src/modules/objects | |
parent | 29a7fc099d155cf11ecee9edc6c7ff18429a7239 (diff) | |
download | kvirc-a232b8a3234cb3d6c1ded204e520ed6d70669230.tar.gz kvirc-a232b8a3234cb3d6c1ded204e520ed6d70669230.zip |
Fix accidental conversion of dockwin
Diffstat (limited to 'src/modules/objects')
-rw-r--r-- | src/modules/objects/Makefile.am | 6 | ||||
-rw-r--r-- | src/modules/objects/class_doctwindow.cpp | 54 | ||||
-rw-r--r-- | src/modules/objects/class_doctwindow.h | 6 | ||||
-rw-r--r-- | src/modules/objects/libkviobjects.cpp | 6 |
4 files changed, 36 insertions, 36 deletions
diff --git a/src/modules/objects/Makefile.am b/src/modules/objects/Makefile.am index ec1ae47c..c4574582 100644 --- a/src/modules/objects/Makefile.am +++ b/src/modules/objects/Makefile.am @@ -15,7 +15,7 @@ libkviobjects_la_SOURCES = libkviobjects.cpp \ class_checkbox.cpp \ class_combobox.cpp \ class_dialog.cpp \ - class_doctwindow.cpp \ + class_dockwindow.cpp \ class_file.cpp \ class_groupbox.cpp \ class_label.cpp \ @@ -60,7 +60,7 @@ noinst_HEADERS= class_button.h \ class_checkbox.h \ class_combobox.h \ class_dialog.h \ - class_doctwindow.h \ + class_dockwindow.h \ class_file.h \ class_groupbox.h \ class_label.h \ @@ -105,7 +105,7 @@ class_checkbox.cpp: m_class_checkbox.moc class_combobox.cpp: m_class_combobox.moc class_button.cpp: m_class_button.moc class_dialog.cpp: m_class_dialog.moc -class_doctwindow.cpp: m_class_doctwindow.moc +class_dockwindow.cpp: m_class_dockwindow.moc class_file.cpp: m_class_file.moc class_groupbox.cpp: m_class_groupbox.moc class_label.cpp: m_class_label.moc diff --git a/src/modules/objects/class_doctwindow.cpp b/src/modules/objects/class_doctwindow.cpp index 296a192b..40fc473b 100644 --- a/src/modules/objects/class_doctwindow.cpp +++ b/src/modules/objects/class_doctwindow.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : class_doctwindow.cpp +// File : class_dockwindow.cpp // Created on Thu 29 Dec 2005 23:45:11 by Szymon Stefanek // // This file is part of the KVIrc IRC Client distribution @@ -22,7 +22,7 @@ // //============================================================================= -#include "class_doctwindow.h" +#include "class_dockwindow.h" #include "kvi_frame.h" #include "kvi_locale.h" @@ -31,15 +31,15 @@ #include <TQDockWidget> #define TQT_DOCK_WINDOW TQDockWidget #else - #include <tqdoctwindow.h> + #include <tqdockwindow.h> #define TQT_DOCK_WINDOW TQDockWindow #endif #include <tqlayout.h> /* - @doc: doctwindow + @doc: dockwindow @title: - doctwindow class + dockwindow class @type: class @short: @@ -74,27 +74,27 @@ */ -KVSO_BEGIN_REGISTERCLASS(KviKvsObject_doctwindow,"doctwindow","widget") - KVSO_REGISTER_HANDLER(KviKvsObject_doctwindow,"addWidget",function_addWidget) - KVSO_REGISTER_HANDLER(KviKvsObject_doctwindow,"orientation",function_orientation) - KVSO_REGISTER_HANDLER(KviKvsObject_doctwindow,"setOrientation",function_setOrientation) - KVSO_REGISTER_HANDLER(KviKvsObject_doctwindow,"resizeEnabled",function_resizeEnabled) - KVSO_REGISTER_HANDLER(KviKvsObject_doctwindow,"setResizeEnabled",function_setResizeEnabled) - KVSO_REGISTER_HANDLER(KviKvsObject_doctwindow,"setAllowedDockAreas",function_setAllowedDockAreas) - KVSO_REGISTER_HANDLER(KviKvsObject_doctwindow,"dock",function_dock) -KVSO_END_REGISTERCLASS(KviKvsObject_doctwindow) +KVSO_BEGIN_REGISTERCLASS(KviKvsObject_dockwindow,"dockwindow","widget") + KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"addWidget",function_addWidget) + KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"orientation",function_orientation) + KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"setOrientation",function_setOrientation) + KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"resizeEnabled",function_resizeEnabled) + KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"setResizeEnabled",function_setResizeEnabled) + KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"setAllowedDockAreas",function_setAllowedDockAreas) + KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"dock",function_dock) +KVSO_END_REGISTERCLASS(KviKvsObject_dockwindow) -KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_doctwindow,KviKvsObject_widget) -KVSO_END_CONSTRUCTOR(KviKvsObject_doctwindow) +KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_dockwindow,KviKvsObject_widget) +KVSO_END_CONSTRUCTOR(KviKvsObject_dockwindow) -KVSO_BEGIN_DESTRUCTOR(KviKvsObject_doctwindow) -KVSO_END_DESTRUCTOR(KviKvsObject_doctwindow) +KVSO_BEGIN_DESTRUCTOR(KviKvsObject_dockwindow) +KVSO_END_DESTRUCTOR(KviKvsObject_dockwindow) #define _pDockWindow ((TQT_DOCK_WINDOW *)widget()) -bool KviKvsObject_doctwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) +bool KviKvsObject_dockwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) { #ifdef COMPILE_USE_QT4 TQDockWidget * pWidget = new TQDockWidget(g_pFrame); @@ -106,7 +106,7 @@ bool KviKvsObject_doctwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariant return true; } -bool KviKvsObject_doctwindow::function_addWidget(KviKvsObjectFunctionCall *c) +bool KviKvsObject_dockwindow::function_addWidget(KviKvsObjectFunctionCall *c) { kvs_hobject_t hWidget; KVSO_PARAMETERS_BEGIN(c) @@ -155,7 +155,7 @@ bool KviKvsObject_doctwindow::function_addWidget(KviKvsObjectFunctionCall *c) return true; } -bool KviKvsObject_doctwindow::function_orientation(KviKvsObjectFunctionCall * c) +bool KviKvsObject_dockwindow::function_orientation(KviKvsObjectFunctionCall * c) { if(!widget())return true; // hum ? dead ? #ifdef COMPILE_USE_QT4 @@ -166,7 +166,7 @@ bool KviKvsObject_doctwindow::function_orientation(KviKvsObjectFunctionCall * c) return true; } -bool KviKvsObject_doctwindow::function_setOrientation(KviKvsObjectFunctionCall * c) +bool KviKvsObject_dockwindow::function_setOrientation(KviKvsObjectFunctionCall * c) { TQString szOrientation; KVSO_PARAMETERS_BEGIN(c) @@ -180,7 +180,7 @@ bool KviKvsObject_doctwindow::function_setOrientation(KviKvsObjectFunctionCall * return true; } -bool KviKvsObject_doctwindow::function_resizeEnabled(KviKvsObjectFunctionCall * c) +bool KviKvsObject_dockwindow::function_resizeEnabled(KviKvsObjectFunctionCall * c) { if(!widget())return true; // hum ? dead ? #ifdef COMPILE_USE_QT4 @@ -191,7 +191,7 @@ bool KviKvsObject_doctwindow::function_resizeEnabled(KviKvsObjectFunctionCall * return true; } -bool KviKvsObject_doctwindow::function_setResizeEnabled(KviKvsObjectFunctionCall * c) +bool KviKvsObject_dockwindow::function_setResizeEnabled(KviKvsObjectFunctionCall * c) { bool bResizeEnabled; KVSO_PARAMETERS_BEGIN(c) @@ -206,7 +206,7 @@ bool KviKvsObject_doctwindow::function_setResizeEnabled(KviKvsObjectFunctionCall return true; } -bool KviKvsObject_doctwindow::function_setAllowedDockAreas(KviKvsObjectFunctionCall * c) +bool KviKvsObject_dockwindow::function_setAllowedDockAreas(KviKvsObjectFunctionCall * c) { TQString szFlags; KVSO_PARAMETERS_BEGIN(c) @@ -242,7 +242,7 @@ bool KviKvsObject_doctwindow::function_setAllowedDockAreas(KviKvsObjectFunctionC } -bool KviKvsObject_doctwindow::function_dock(KviKvsObjectFunctionCall * c) +bool KviKvsObject_dockwindow::function_dock(KviKvsObjectFunctionCall * c) { TQString szDock; KVSO_PARAMETERS_BEGIN(c) @@ -273,4 +273,4 @@ bool KviKvsObject_doctwindow::function_dock(KviKvsObjectFunctionCall * c) return true; } -#include "m_class_doctwindow.moc" +#include "m_class_dockwindow.moc" diff --git a/src/modules/objects/class_doctwindow.h b/src/modules/objects/class_doctwindow.h index 41128074..9ed8f60c 100644 --- a/src/modules/objects/class_doctwindow.h +++ b/src/modules/objects/class_doctwindow.h @@ -2,7 +2,7 @@ #define _CLASS_DOCKWINDOW_H_ //============================================================================= // -// File : class_doctwindow.h +// File : class_dockwindow.h // Created on Thu 29 Dec 2005 23:45:11 by Szymon Stefanek // // This file is part of the KVIrc IRC Client distribution @@ -29,12 +29,12 @@ #include "class_widget.h" -class KviKvsObject_doctwindow : public KviKvsObject_widget +class KviKvsObject_dockwindow : public KviKvsObject_widget { Q_OBJECT TQ_OBJECT public: - KVSO_DECLARE_OBJECT(KviKvsObject_doctwindow) + KVSO_DECLARE_OBJECT(KviKvsObject_dockwindow) protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 68456034..977c8c9b 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -83,7 +83,7 @@ #include "class_wrapper.h" #include "class_dialog.h" #include "class_xmlreader.h" -#include "class_doctwindow.h" +#include "class_dockwindow.h" #include "class_vbox.h" #include "class_hbox.h" static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spacing, bool bWidgetsOnly, KviKvsArray *n, int &idx); @@ -96,7 +96,7 @@ static bool objects_module_cleanup(KviModule *m) KviKvsObject_wrapper::unregisterSelf(); KviKvsObject_file::unregisterSelf(); KviKvsObject_progressbar::unregisterSelf(); - KviKvsObject_doctwindow::unregisterSelf(); + KviKvsObject_dockwindow::unregisterSelf(); KviKvsObject_wizard::unregisterSelf(); KviKvsObject_window::unregisterSelf(); KviKvsObject_urlabel::unregisterSelf(); @@ -1037,7 +1037,7 @@ static bool objects_module_init(KviModule * m) KviKvsObject_urlabel::registerSelf(); KviKvsObject_window::registerSelf(); KviKvsObject_wizard::registerSelf(); - KviKvsObject_doctwindow::registerSelf(); + KviKvsObject_dockwindow::registerSelf(); KviKvsObject_progressbar::registerSelf(); KviKvsObject_file::registerSelf(); KviKvsObject_wrapper::registerSelf(); |