diff options
| author |  Elvio Basello | 2008-10-10 23:40:56 +0000 |
|---|---|---|
| committer | Elvio Basello | 2008-10-10 23:40:56 +0000 |
| commit | bcb468055027196f7d2309fb14ed25d57bb44aea (patch) | |
| tree | 6d3ba53948a9cfcc656e52710090774b7408eaf4 /src/modules/objects | |
| parent | quick fix (diff) | |
| download | KVIrc-bcb468055027196f7d2309fb14ed25d57bb44aea.tar.gz KVIrc-bcb468055027196f7d2309fb14ed25d57bb44aea.tar.bz2 KVIrc-bcb468055027196f7d2309fb14ed25d57bb44aea.zip | |
rework on toolbars;
bumped sources date;
partial fix for Noldor's commit;
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2692 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/objects')
| -rw-r--r-- | src/modules/objects/class_button.cpp | 9 | ||||
| -rw-r--r-- | src/modules/objects/libkviobjects.cpp | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index 99323cf98..1f4d2ef52 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -27,13 +27,15 @@ #include "kvi_locale.h" #include "kvi_error.h" #include "kvi_iconmanager.h" +#include "kvi_file.h" + #include "class_button.h" #include "class_pixmap.h" #include <QIcon> #include <QPushButton> -#include <kvi_file.h> + /* @@ -82,7 +84,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_button) KVSO_BEGIN_DESTRUCTOR(KviKvsObject_button) -KVSO_END_CONSTRUCTOR(KviKvsObject_button) +KVSO_END_DESTRUCTOR(KviKvsObject_button) bool KviKvsObject_button::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { @@ -156,5 +158,4 @@ void KviKvsObject_button::slotClicked() #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_button.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES - +#endif //COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 5a3cf5fe9..862c3b993 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -40,7 +40,6 @@ #include "class_list.h" #include "class_listwidget.h" #include "class_mainwindow.h" -#include "class_memorybuffer.h" #include "class_menubar.h" #include "class_multilineedit.h" #include "class_painter.h" @@ -90,8 +89,6 @@ static bool objects_module_cleanup(KviModule *m) // Don't attempt to change the order of these calls. // Derived classes must be unregistered before the base ones. - KviKvsObject_memorybuffer::unregisterSelf(); - KviKvsObject_process::unregisterSelf(); KviKvsObject_ftp::unregisterSelf(); KviKvsObject_http::unregisterSelf(); @@ -999,7 +996,6 @@ static bool objects_module_init(KviModule * m) KviKvsObject_ftp::registerSelf(); KviKvsObject_process::registerSelf(); - KviKvsObject_memorybuffer::registerSelf(); return true; } |