From aba8d2293fc3e57c8e75ed2732f8b5b715b1b134 Mon Sep 17 00:00:00 2001 From: Alexey Uzhva Date: Thu, 5 Jul 2007 08:49:05 +0000 Subject: fixed font saving in qt4 kvirc git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@644 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/objects/class_button.cpp | 2 - src/modules/objects/class_checkbox.cpp | 2 - src/modules/objects/class_combobox.cpp | 2 - src/modules/objects/class_dockwindow.cpp | 2 - src/modules/objects/class_file.cpp | 1 - src/modules/objects/class_lineedit.cpp | 2 - src/modules/objects/class_listbox.cpp | 2 - src/modules/objects/class_listview.cpp | 1 - src/modules/objects/class_listviewitem.cpp | 2 - src/modules/objects/class_multilineedit.cpp | 2 - src/modules/objects/class_painter.cpp | 40 ++++++----- src/modules/objects/class_pixmap.cpp | 2 - src/modules/objects/class_popupmenu.cpp | 2 - src/modules/objects/class_process.cpp | 2 - src/modules/objects/class_radiobutton.cpp | 2 - src/modules/objects/class_slider.cpp | 2 - src/modules/objects/class_socket.cpp | 4 +- src/modules/objects/class_spinbox.cpp | 2 - src/modules/objects/class_tabwidget.cpp | 2 - src/modules/objects/class_tbrowser.cpp | 2 - src/modules/objects/class_toolbar.cpp | 2 - src/modules/objects/class_toolbutton.cpp | 2 - src/modules/objects/class_widget.cpp | 1 - src/modules/objects/class_window.cpp | 1 - src/modules/objects/class_wizard.cpp | 1 - src/modules/objects/class_wrapper.cpp | 2 - src/modules/objects/class_xmlreader.cpp | 2 - src/modules/objects/objects.pro | 101 ++++++++++++++++++++++++++++ src/modules/objects/pch.h | 8 +++ 29 files changed, 129 insertions(+), 69 deletions(-) create mode 100644 src/modules/objects/objects.pro create mode 100644 src/modules/objects/pch.h (limited to 'src/modules/objects') diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index fd8a4b3b5..bbb95cdcb 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -174,5 +174,3 @@ void KviKvsObject_button::slotClicked() callFunction(this,"clickEvent",params); } - -#include "m_class_button.moc" diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp index 1e9260509..6545d8a1b 100644 --- a/src/modules/objects/class_checkbox.cpp +++ b/src/modules/objects/class_checkbox.cpp @@ -124,5 +124,3 @@ void KviKvsObject_checkbox::toggled(bool b) callFunction(this,"toggleEvent",¶ms); } - -#include "m_class_checkbox.moc" diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index f8c3d3d6b..146a92bed 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -362,5 +362,3 @@ void KviKvsObject_combobox::slotActivated(int i) callFunction(this,"activatedEvent",¶ms); } - -#include "m_class_combobox.moc" diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp index a6067a505..fc2276e91 100644 --- a/src/modules/objects/class_dockwindow.cpp +++ b/src/modules/objects/class_dockwindow.cpp @@ -227,5 +227,3 @@ bool KviKvsObject_dockwindow::function_dock(KviKvsObjectFunctionCall * c) else c->warning(__tr2qs("Invalid dock area specified")); return true; } - -#include "m_class_dockwindow.moc" diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp index 55bbd4f29..010a51be9 100644 --- a/src/modules/objects/class_file.cpp +++ b/src/modules/objects/class_file.cpp @@ -485,4 +485,3 @@ bool KviScriptFileObject::functionHexRead(KviCommand * c, KviParameterList * p, } */ -#include "m_class_file.moc" diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp index a5e94ebc7..37144e2bf 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -457,5 +457,3 @@ void KviKvsObject_lineedit::slottextChanged(const QString &text) callFunction(this,"textChangedEvent",¶ms); } - -#include "m_class_lineedit.moc" diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp index bf7292773..8a56e2c75 100644 --- a/src/modules/objects/class_listbox.cpp +++ b/src/modules/objects/class_listbox.cpp @@ -386,5 +386,3 @@ kvs_uint_t uIndex; return true; } - -#include "m_class_listbox.moc" diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp index 4a6d03924..9f384cd5d 100644 --- a/src/modules/objects/class_listview.cpp +++ b/src/modules/objects/class_listview.cpp @@ -554,4 +554,3 @@ void KviKvsMdmListView::contentsDropEvent(QDropEvent *e) } } -#include "m_class_listview.moc" diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp index 7d193b98f..5136fda10 100644 --- a/src/modules/objects/class_listviewitem.cpp +++ b/src/modules/objects/class_listviewitem.cpp @@ -417,5 +417,3 @@ bool KviKvsObject_listviewitem::function_setPixmap(KviKvsObjectFunctionCall *c) m_pListViewItem->setPixmap(uCol,*pix); return true; } - -#include "m_class_listviewitem.moc" diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index 8be51a018..e3f8d0947 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -1213,5 +1213,3 @@ bool KviKvsObject_mledit::functionselectAll(KviKvsObjectFunctionCall *c) } - -#include "m_class_multilineedit.moc" diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index 5c45910d2..fd2c0ab3e 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -956,20 +956,20 @@ bool KviKvsObject_painter::functionresetMatrix(KviKvsObjectFunctionCall *c) } #ifdef COMPILE_USE_QT4 -bool KviKvsObject_painter::functionsetOpacity(KviKvsObjectFunctionCall *c) -{ - if(!m_pPainter)return true; - kvs_real_t dOpacity; - - KVSO_PARAMETERS_BEGIN(c) - KVSO_PARAMETER("opacity_factor",KVS_PT_DOUBLE,0,dOpacity) - KVSO_PARAMETERS_END(c) - m_pPainter->setOpacity(dOpacity); - return true; -} +bool KviKvsObject_painter::functionsetOpacity(KviKvsObjectFunctionCall *c) +{ + if(!m_pPainter)return true; + kvs_real_t dOpacity; + + KVSO_PARAMETERS_BEGIN(c) + KVSO_PARAMETER("opacity_factor",KVS_PT_DOUBLE,0,dOpacity) + KVSO_PARAMETERS_END(c) + m_pPainter->setOpacity(dOpacity); + return true; +} bool KviKvsObject_painter::functionsetTextAntialiasing(KviKvsObjectFunctionCall *c) { - if(!m_pPainter)return true; + if(!m_pPainter)return true; bool bEnabled; KVSO_PARAMETERS_BEGIN(c) @@ -977,10 +977,10 @@ bool KviKvsObject_painter::functionsetTextAntialiasing(KviKvsObjectFunctionCall KVSO_PARAMETERS_END(c) m_pPainter->setRenderHint(QPainter::TextAntialiasing,bEnabled); return true; -} +} bool KviKvsObject_painter::functionsetAntialiasing(KviKvsObjectFunctionCall *c) { - if(!m_pPainter)return true; + if(!m_pPainter)return true; bool bEnabled; KVSO_PARAMETERS_BEGIN(c) @@ -988,10 +988,10 @@ bool KviKvsObject_painter::functionsetAntialiasing(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) m_pPainter->setRenderHint(QPainter::Antialiasing,bEnabled); return true; -} +} bool KviKvsObject_painter::functionsetSmoothPixmapTransform(KviKvsObjectFunctionCall *c) { - if(!m_pPainter)return true; + if(!m_pPainter)return true; bool bEnabled; KVSO_PARAMETERS_BEGIN(c) @@ -999,9 +999,7 @@ bool KviKvsObject_painter::functionsetSmoothPixmapTransform(KviKvsObjectFunction KVSO_PARAMETERS_END(c) m_pPainter->setRenderHint(QPainter::SmoothPixmapTransform,bEnabled); return true; -} -#endif - - +} +#endif + -#include "m_class_painter.moc" diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp index 89247edb9..6028642b6 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -313,5 +313,3 @@ QImage * KviKvsObject_pixmap::getImage() return m_pImage; } - -#include "m_class_pixmap.moc" diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index c32d0f891..d47a1f7bd 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -357,5 +357,3 @@ bool KviKvsObject_popupmenu::functionactivatedEvent(KviKvsObjectFunctionCall *c) return true; } - -#include "m_class_popupmenu.moc" diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp index e0951b14e..1ff1544b0 100644 --- a/src/modules/objects/class_process.cpp +++ b/src/modules/objects/class_process.cpp @@ -313,5 +313,3 @@ void KviKvsObject_process::slotReadStderr() KviKvsVariantList *params=0; callFunction(this,"readyReadStderrEvent",params); } - -#include "m_class_process.moc" diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index 402d24b50..5b2a44b3d 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -134,5 +134,3 @@ void KviKvsObject_radiobutton::toggled(bool b) callFunction(this,"toggleEvent",¶ms); } - -#include "m_class_radiobutton.moc" diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp index 54673d610..02d2d5312 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -283,5 +283,3 @@ void KviKvsObject_slider::valueChanged(int value) callFunction(this,"valueChangedEvent",¶ms); } - -#include "m_class_slider.moc" diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 3819ca05b..f0d71edb6 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -1326,6 +1326,4 @@ KviQCString szData8 = szData.utf8(); -//-------------- - -#include "m_class_socket.moc" +//------------- \ No newline at end of file diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp index 6b0147f24..bcd6acaf9 100644 --- a/src/modules/objects/class_spinbox.cpp +++ b/src/modules/objects/class_spinbox.cpp @@ -261,5 +261,3 @@ void KviKvsObject_spinbox::valueChanged(int value) KviKvsVariantList params(new KviKvsVariant((kvs_int_t)value)); callFunction(this,"valueChangedEvent",¶ms); } - -#include "m_class_spinbox.moc" diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index 998bb3f44..5d6d5ebba 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -537,5 +537,3 @@ void KviKvsObject_tabwidget::slotCurrentChanged(int value) KviKvsVariantList params(new KviKvsVariant((kvs_int_t)value)); callFunction(this,"currentChangedEvent",¶ms); } - -#include "m_class_tabwidget.moc" diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp index bd46f0803..d3f2aac41 100644 --- a/src/modules/objects/class_tbrowser.cpp +++ b/src/modules/objects/class_tbrowser.cpp @@ -139,5 +139,3 @@ bool KviKvsObject_textbrowser::function_linkClickedEvent(KviKvsObjectFunctionCal emitSignal("linkClicked",c,c->params()); return true; } - -#include "m_class_tbrowser.moc" diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp index e8e3292e6..a8f1fc05b 100644 --- a/src/modules/objects/class_toolbar.cpp +++ b/src/modules/objects/class_toolbar.cpp @@ -149,5 +149,3 @@ bool KviKvsObject_toolbar::functionclear(KviKvsObjectFunctionCall *c) return true; } -#include "m_class_toolbar.moc" - diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index 3a531da30..a4c5ed7a5 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -337,5 +337,3 @@ void KviKvsObject_toolbutton::slotClicked() callFunction(this,"clickEvent",params); } -#include "m_class_toolbutton.moc" - diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index 3d9cb936a..44fb2e77d 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -1742,4 +1742,3 @@ bool KviKvsObject_widget::function_setAttribute(KviKvsObjectFunctionCall *c) } #endif -#include "m_class_widget.moc" diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp index 7bcbea852..85fb4a7c3 100644 --- a/src/modules/objects/class_window.cpp +++ b/src/modules/objects/class_window.cpp @@ -155,4 +155,3 @@ bool KviKvsObject_window::functionsetCentralWidget(KviKvsObjectFunctionCall *c) ((KviKvsScriptWindowWindow *)widget())->setCentralWidget((KviKvsObject_widget *)ob,((KviKvsObject_widget *)ob)->widget()); return true; } -#include "m_class_window.moc" diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp index 83117af97..c7d8770e8 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -387,4 +387,3 @@ void KviKvsMdmWizard::slotBackClicked() KviKvsMdmWizard::~KviKvsMdmWizard() { } -#include "m_class_wizard.moc" diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index 464f10f85..9eb1f6a9b 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -265,5 +265,3 @@ QWidget *KviKvsObject_wrapper::findWidgetToWrap(const char *szClass, const char return 0; #endif } - -#include "m_class_wrapper.moc" diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp index e4ac20acf..3690c64e9 100644 --- a/src/modules/objects/class_xmlreader.cpp +++ b/src/modules/objects/class_xmlreader.cpp @@ -330,5 +330,3 @@ bool KviKvsObject_xmlreader::function_lastError(KviKvsObjectFunctionCall *c) c->returnValue()->setString(m_szLastError); return true; } - -#include "m_class_xmlreader.moc" diff --git a/src/modules/objects/objects.pro b/src/modules/objects/objects.pro new file mode 100644 index 000000000..eac04a872 --- /dev/null +++ b/src/modules/objects/objects.pro @@ -0,0 +1,101 @@ +QT += xml + +LIBS += -lws2_32 + +PRECOMPILED_HEADER = pch.h + +precompile_header:!isEmpty(PRECOMPILED_HEADER) { + DEFINES += USING_PCH + } + +TARGET = kviobjects + +HEADERS += class_button.h \ + class_buttongroup.h \ + class_checkbox.h \ + class_combobox.h \ + class_dialog.h \ + class_dockwindow.h \ + class_file.h \ + class_groupbox.h \ + class_label.h \ + class_layout.h \ + class_lcd.h \ + class_lineedit.h \ + class_list.h \ + class_listbox.h \ + class_listview.h \ + class_listviewitem.h \ + class_mainwindow.h \ + class_menubar.h \ + class_multilineedit.h \ + class_painter.h \ + class_pixmap.h \ + class_popupmenu.h \ + class_process.h \ + class_progressbar.h \ + class_radiobutton.h \ + class_slider.h \ + class_socket.h \ + class_spinbox.h \ + class_tabwidget.h \ + class_tbrowser.h \ + class_toolbar.h \ + class_toolbutton.h \ + class_urllabel.h \ + class_widget.h \ + class_window.h \ + class_wizard.h \ + class_workspace.h \ + class_wrapper.h \ + class_xmlreader.h \ + class_vbox.h \ + class_hbox.h \ + object_macros.h + + +SOURCES += libkviobjects.cpp \ + class_button.cpp \ + class_buttongroup.cpp \ + class_checkbox.cpp \ + class_combobox.cpp \ + class_dialog.cpp \ + class_dockwindow.cpp \ + class_file.cpp \ + class_groupbox.cpp \ + class_label.cpp \ + class_layout.cpp \ + class_lcd.cpp \ + class_lineedit.cpp \ + class_list.cpp \ + class_listbox.cpp \ + class_listview.cpp \ + class_listviewitem.cpp \ + class_mainwindow.cpp \ + class_menubar.cpp \ + class_multilineedit.cpp \ + class_popupmenu.cpp \ + class_process.cpp \ + class_progressbar.cpp \ + class_radiobutton.cpp \ + class_slider.cpp \ + class_socket.cpp \ + class_spinbox.cpp \ + class_tabwidget.cpp \ + class_toolbar.cpp \ + class_toolbutton.cpp \ + class_painter.cpp \ + class_pixmap.cpp \ + class_tbrowser.cpp \ + class_widget.cpp \ + class_window.cpp \ + class_wizard.cpp \ + class_workspace.cpp \ + class_wrapper.cpp \ + class_urllabel.cpp \ + class_xmlreader.cpp \ + class_vbox.cpp \ + class_hbox.cpp + + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/objects/pch.h b/src/modules/objects/pch.h new file mode 100644 index 000000000..7f94318ca --- /dev/null +++ b/src/modules/objects/pch.h @@ -0,0 +1,8 @@ +#if defined __cplusplus + #include // All moc genereated code has this include + #include + #include "kvi_settings.h" + #include "kvi_app.h" + #include "object_macros.h" + #include "kvi_locale.h" +#endif -- cgit v1.3.1-10-gc9f91