From bb4fcd90315ef77460676935005cdbbde1e55f76 Mon Sep 17 00:00:00 2001 From: Noldor Date: Mon, 4 Aug 2008 16:14:40 +0000 Subject: more QT4 port (objects module) + vs2005 projects update + some compilation fixes git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2174 17fca916-40b9-46aa-a4ea-0a15b648b75c --- TODO-Qt4 | 27 +- kvirc_QT4_vc05.sln | 4 +- src/kvilib/kvilib_QT4_vc05.vcproj | 102 +- src/kvilib/tal/kvi_tal_tablewidget.cpp | 2 +- src/kvirc/kvirc_QT4_vc05.vcproj | 38 +- src/kvirc/ui/kvi_menubar.cpp | 2 +- .../filetransferwindow/filetransferwindow.cpp | 12 +- .../filetransferwindow_QT4_vc05.vcproj | 2 +- src/modules/objects/class_checkbox.cpp | 3 +- src/modules/objects/class_combobox.cpp | 12 +- src/modules/objects/class_file.cpp | 10 +- src/modules/objects/class_layout.cpp | 2 +- src/modules/objects/class_multilineedit.cpp | 4 +- src/modules/objects/class_painter.h | 2 +- src/modules/objects/class_pixmap.cpp | 15 +- src/modules/objects/class_radiobutton.cpp | 2 +- src/modules/objects/class_slider.cpp | 12 +- src/modules/objects/class_socket.cpp | 19 +- src/modules/objects/class_spinbox.cpp | 10 +- src/modules/objects/class_tabwidget.cpp | 8 +- src/modules/objects/class_tbrowser.cpp | 2 +- src/modules/objects/class_urllabel.cpp | 2 +- src/modules/objects/class_widget.cpp | 42 +- src/modules/objects/objects.vcproj | 2298 +++++++++++--------- src/modules/options/options_QT4_vc05.vcproj | 2 +- src/modules/theme/packthemedialog.cpp | 8 +- 26 files changed, 1460 insertions(+), 1182 deletions(-) diff --git a/TODO-Qt4 b/TODO-Qt4 index ef1eab5e2..2f0e56f1d 100644 --- a/TODO-Qt4 +++ b/TODO-Qt4 @@ -3,16 +3,6 @@ Files listed below need working to be ported to Qt4. They still have Qt3 code, unworking Qt4 code, q3support, fuzzy ifdefs os simply they're still the old unchecked kvirc3 files. -Qt3 support member convertFromImage() seems to behave differently than -Qt4 fromImage(), hence the transparency is currently broken and needs -to be revised. -Qt3 Support Member: bool QPixmap::convertFromImage ( const QImage & image, ColorMode mode ) -Qt4: QPixmap QPixmap::fromImage ( const QImage & image, Qt::ImageConversionFlags flags = Qt::AutoColor ) [static] -some changes in code were just -s/convertFromImage/fromImage/ (for example revision 1886) -which doesn't sound right -(affected is g_pShadedChildGlobalDesktopBackground from - src/kvirc/kernel/kvi_app.cpp and possibly some other) PLEASE KEEP THIS FILE UPDATED! @@ -29,30 +19,39 @@ src/kvilib/tal src/kvirc/kernel app.cpp - q3mimefactory - kvi_filetransfer.cpp kvi_iconmanager.cpp + kvi_ircconnectiontargetresolver (QString related stuff) + kvi_ircsocket.cpp (QString related stuff) + src/kvirc/kvs kvi_kvs_coresimplecommands_gl.cpp - q3mimefactory src/kvirc/ui: kvi_ircviewtools.cpp (graphic bug in panel view) kvi_statusbar.cpp (QT4 ported but still some bugs) - kvi_styled_controls.cpp (QIcon stuff+segfault with mingw compiler) kvi_mdichild.cpp (bug in resize) kvi_menubar.cpp + kvi_query.cpp (QString related stuff) kvi_topicw.cpp src/modules dcc editor - q3support iograph - all excluded by #if - objects - q3support + objects - qt3support: + listbox + listview + listviewitem + menubar + multilineedit + toolbutton + urllabel + wrapper options optw_connection: some checkboxes not working optw_dcc: some checkboxes not working optw_proxy: segfault removing proxy from list (listwidget issue) optw_server: buttons on the right are messed torrent - broken - fileTransferWindow links help list diff --git a/kvirc_QT4_vc05.sln b/kvirc_QT4_vc05.sln index 446d595f7..1a0a8d4fd 100644 --- a/kvirc_QT4_vc05.sln +++ b/kvirc_QT4_vc05.sln @@ -168,7 +168,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logview", "src\modules\logv {92803FDD-DFDB-461D-8AA3-1F201F4EA06C} = {92803FDD-DFDB-461D-8AA3-1F201F4EA06C} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "objects", "src\modules\objects\objects_QT4_vc05.vcproj", "{A58E91C7-B9B7-4BBA-A79D-73EDE4C99D62}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "objects", "src\modules\objects\objects.vcproj", "{A58E91C7-B9B7-4BBA-A79D-73EDE4C99D62}" ProjectSection(ProjectDependencies) = postProject {92803FDD-DFDB-461D-8AA3-1F201F4EA06C} = {92803FDD-DFDB-461D-8AA3-1F201F4EA06C} EndProjectSection @@ -218,7 +218,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rijndael", "src\modules\rij {92803FDD-DFDB-461D-8AA3-1F201F4EA06C} = {92803FDD-DFDB-461D-8AA3-1F201F4EA06C} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reguser", "src\modules\reguser\reguser_QT4_vc05.vcproj", "{12DB9879-4F34-4EFC-8415-8714224CDDF4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reguser", "src\modules\reguser\reguser_QT4_vc05 22.vcproj", "{12DB9879-4F34-4EFC-8415-8714224CDDF4}" ProjectSection(ProjectDependencies) = postProject {92803FDD-DFDB-461D-8AA3-1F201F4EA06C} = {92803FDD-DFDB-461D-8AA3-1F201F4EA06C} EndProjectSection diff --git a/src/kvilib/kvilib_QT4_vc05.vcproj b/src/kvilib/kvilib_QT4_vc05.vcproj index a545cc1be..93b5e584d 100644 --- a/src/kvilib/kvilib_QT4_vc05.vcproj +++ b/src/kvilib/kvilib_QT4_vc05.vcproj @@ -43,12 +43,12 @@ Optimization="0" FavorSizeOrSpeed="1" AdditionalIncludeDirectories=""$(ProjectDir)\tal";"$(ProjectDir)\system";"$(ProjectDir)\irc";"$(ProjectDir)\file";"$(ProjectDir)\ext";"$(ProjectDir)\net";"$(ProjectDir)\core\wstring";"$(ProjectDir)\core";"$(ProjectDir)\config";"$(SSLINCDIR)";"$(QTDIR)\include\";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"$(ZLIBINCDIR)"" - PreprocessorDefinitions="WIN32;_DEBUG;QT3_SUPPORT;_WINDOWS;_USRDLL;KVILIB_EXPORTS;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;QT3_SUPPORT;_WINDOWS;_USRDLL;KVILIB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;__KVILIB__" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="1" Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> @@ -131,12 +131,12 @@ FavorSizeOrSpeed="1" OmitFramePointers="true" AdditionalIncludeDirectories=""$(ProjectDir)\tal";"$(ProjectDir)\system";"$(ProjectDir)\irc";"$(ProjectDir)\file";"$(ProjectDir)\ext";"$(ProjectDir)\net";"$(ProjectDir)\core\wstring";"$(ProjectDir)\core";"$(ProjectDir)\config";"$(SSLINCDIR)";"$(QTDIR)\include\";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"$(ZLIBINCDIR)"" - PreprocessorDefinitions="WIN32;QT3_SUPPORT;NDEBUG;_WINDOWS;_USRDLL;KVILIB_EXPORTS;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;QT3_SUPPORT;NDEBUG;_WINDOWS;_USRDLL;KVILIB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;__KVILIB__" MinimalRebuild="false" ExceptionHandling="1" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="0" Detect64BitPortabilityProblems="false" DebugInformationFormat="0" /> @@ -198,6 +198,14 @@ Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" > + + + + @@ -370,10 +378,6 @@ RelativePath="core\kvi_string.cpp" > - - @@ -434,6 +438,10 @@ RelativePath=".\tal\kvi_tal_tabdialog.cpp" > + + @@ -503,6 +511,23 @@ /> + + + + + + + @@ -1627,26 +1652,6 @@ /> - - - - - - - - @@ -1901,7 +1906,7 @@ > @@ -1909,6 +1914,15 @@ + + + @@ -2099,6 +2113,28 @@ /> + + + + + + + + @@ -2433,10 +2469,6 @@ /> - - @@ -2489,6 +2521,10 @@ UniqueIdentifier="{fe6e9830-be46-497d-995d-44b99b58e215}" ParseFiles="false" > + + diff --git a/src/kvilib/tal/kvi_tal_tablewidget.cpp b/src/kvilib/tal/kvi_tal_tablewidget.cpp index e682ea00d..bafe3d1eb 100644 --- a/src/kvilib/tal/kvi_tal_tablewidget.cpp +++ b/src/kvilib/tal/kvi_tal_tablewidget.cpp @@ -97,5 +97,5 @@ void KviTalTreeWidget::redirect_itemPressed(QTreeWidgetItem *pItem,int col) } */ #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "kvi_tal_treewidget.moc" + #include "kvi_tal_tablewidget.moc" #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/kvirc/kvirc_QT4_vc05.vcproj b/src/kvirc/kvirc_QT4_vc05.vcproj index 088c018cc..42b8edede 100644 --- a/src/kvirc/kvirc_QT4_vc05.vcproj +++ b/src/kvirc/kvirc_QT4_vc05.vcproj @@ -44,7 +44,7 @@ InlineFunctionExpansion="0" FavorSizeOrSpeed="1" AdditionalIncludeDirectories=""$(ProjectDir)\..\kvilib\tal";"$(ProjectDir)\..\kvilib\system";"$(ProjectDir)\..\kvilib\irc";"$(ProjectDir)\..\kvilib\file";"$(ProjectDir)\..\kvilib\ext";"$(ProjectDir)\..\kvilib\net";"$(ProjectDir)\..\kvilib\core\wstring";"$(ProjectDir)\..\kvilib\core";"$(ProjectDir)\..\kvilib\config";"$(SSLINCDIR)";"$(QTDIR)\include";"$(ProjectDir)\kvs";"$(ProjectDir)\module";"$(ProjectDir)\uparser\scripttoolbar";"$(ProjectDir)\uparser";"$(ProjectDir)\sparser";"$(ProjectDir)\kernel";"$(ProjectDir)\ui";"$(ZLIBINCDIR)";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="QT3_SUPPORT;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" MinimalRebuild="true" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -130,7 +130,7 @@ InlineFunctionExpansion="0" FavorSizeOrSpeed="1" AdditionalIncludeDirectories=""$(ProjectDir)\..\kvilib\tal";"$(ProjectDir)\..\kvilib\system";"$(ProjectDir)\..\kvilib\irc";"$(ProjectDir)\..\kvilib\file";"$(ProjectDir)\..\kvilib\ext";"$(ProjectDir)\..\kvilib\net";"$(ProjectDir)\..\kvilib\core\wstring";"$(ProjectDir)\..\kvilib\core";"$(ProjectDir)\..\kvilib\config";"$(SSLINCDIR)";"$(QTDIR)\include";"$(ProjectDir)\kvs";"$(ProjectDir)\module";"$(ProjectDir)\uparser\scripttoolbar";"$(ProjectDir)\uparser";"$(ProjectDir)\sparser";"$(ProjectDir)\kernel";"$(ProjectDir)\ui";"$(ZLIBINCDIR)";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="QT3_SUPPORT;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="2" @@ -1178,10 +1178,6 @@ RelativePath=".\ui\kvi_statusbarapplet.cpp" > - - @@ -1666,6 +1662,10 @@ RelativePath=".\kvs\kvi_kvs_treenode_specialcommandclass.cpp" > + + @@ -2235,6 +2235,10 @@ RelativePath=".\kvs\kvi_kvs_treenode_specialcommandclass.h" > + + @@ -3571,28 +3575,6 @@ /> - - - - - - - - diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp index 7e78560a3..b999e0d66 100644 --- a/src/kvirc/ui/kvi_menubar.cpp +++ b/src/kvirc/ui/kvi_menubar.cpp @@ -273,7 +273,7 @@ void KviMenuBar::newConnectionToServer(int id) } else { text.replace(QString("&"),QString("")); KviStr szCommand; - if(KviIrcUrl::parse(text.utf8().data(),szCommand,KVI_IRCURL_CONTEXT_FIRSTFREE)) + if(KviIrcUrl::parse(text.toUtf8().data(),szCommand,KVI_IRCURL_CONTEXT_FIRSTFREE)) { KviKvsScript::run(szCommand.ptr(),g_pApp->activeConsole()); } diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index ac4ff5e9d..8e5d05e6a 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -143,7 +143,7 @@ void KviFileTransferItemDelegate::paint(QPainter * p, const QStyleOptionViewItem p->setFont(option.font); - p->setPen(option.state & QStyle::State_Selected ? option.palette.highlight() : option.palette.base()); + p->setPen(option.state & QStyle::State_Selected ? option.palette.highlight().color() : option.palette.base().color()); p->drawRect(option.rect); p->setPen(transfer->active() ? QColor(180,180,180) : QColor(200,200,200)); @@ -182,9 +182,11 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv m_pInput = new KviInput(this,0); - m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter"); - m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter,"vsplitter"); - + m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter->setObjectName("transferwindow_hsplitter"); + m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter); + m_pVertSplitter->setObjectName("transferwindow_vsplitter"); + m_pTableWidget = new KviFileTransferWidget(m_pVertSplitter); //ad-hoc itemdelegate for this view @@ -645,7 +647,7 @@ void KviFileTransferWindow::openLocalFileFolder() if(!t)return; QString tmp = t->localFileName(); if(tmp.isEmpty())return; - tmp=QFileInfo(tmp).dirPath(TRUE); + tmp=QFileInfo(tmp).absolutePath(); tmp.replace('/','\\'); tmp.prepend("explorer.exe "); WinExec(tmp.toLocal8Bit().data(), SW_MAXIMIZE); diff --git a/src/modules/filetransferwindow/filetransferwindow_QT4_vc05.vcproj b/src/modules/filetransferwindow/filetransferwindow_QT4_vc05.vcproj index 8eef8629e..d395753df 100644 --- a/src/modules/filetransferwindow/filetransferwindow_QT4_vc05.vcproj +++ b/src/modules/filetransferwindow/filetransferwindow_QT4_vc05.vcproj @@ -135,7 +135,7 @@ EnableFiberSafeOptimizations="true" WholeProgramOptimization="true" AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\net";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FILETRANSFERWINDOW_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FILETRANSFERWINDOW_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" StringPooling="true" MinimalRebuild="true" ExceptionHandling="1" diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp index a3f73ddd9..cc6ae94fc 100644 --- a/src/modules/objects/class_checkbox.cpp +++ b/src/modules/objects/class_checkbox.cpp @@ -78,7 +78,8 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_checkbox) bool KviKvsObject_checkbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - QCheckBox * cb = new QCheckBox(parentScriptWidget(), getName().toUtf8().data()); + QCheckBox * cb = new QCheckBox(parentScriptWidget()); + cb->setObjectName(getName().toUtf8().data()); setObject(cb, true); connect(cb,SIGNAL(toggled(bool)),this,SLOT(toggled(bool))); connect(widget(),SIGNAL(clicked()),this,SLOT(slotClicked())); diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index 8b96fd386..bed30afd9 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -317,17 +317,17 @@ bool KviKvsObject_combobox::functionsetInsertionPolicy(KviKvsObjectFunctionCall KVSO_PARAMETERS_END(c) if(!widget()) return true; if(KviQString::equalCI(szPolicy,"NoInsertion")) - ((QComboBox *)widget())->setInsertPolicy(QComboBox::NoInsertion); + ((QComboBox *)widget())->setInsertPolicy(QComboBox::NoInsert); else if(KviQString::equalCI(szPolicy,"AtTop")) - ((QComboBox *)widget())->setInsertPolicy(QComboBox::AtTop); + ((QComboBox *)widget())->setInsertPolicy(QComboBox::InsertAtTop); else if(KviQString::equalCI(szPolicy,"AtBotton")) - ((QComboBox *)widget())->setInsertPolicy(QComboBox::AtBottom); + ((QComboBox *)widget())->setInsertPolicy(QComboBox::InsertAtBottom); else if(KviQString::equalCI(szPolicy,"AtCurrent")) - ((QComboBox *)widget())->setInsertPolicy(QComboBox::AtCurrent); + ((QComboBox *)widget())->setInsertPolicy(QComboBox::InsertAtCurrent); else if(KviQString::equalCI(szPolicy,"AfterCurrent")) - ((QComboBox *)widget())->setInsertPolicy(QComboBox::AfterCurrent); + ((QComboBox *)widget())->setInsertPolicy(QComboBox::InsertAfterCurrent); else if(KviQString::equalCI(szPolicy,"BeforeCurrent")) - ((QComboBox *)widget())->setInsertPolicy(QComboBox::BeforeCurrent); + ((QComboBox *)widget())->setInsertPolicy(QComboBox::InsertBeforeCurrent); else c->warning(__tr2qs("Invalid insertion Policy %Q"),&szPolicy); return true; } diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp index 4bf98f40c..59196826d 100644 --- a/src/modules/objects/class_file.cpp +++ b/src/modules/objects/class_file.cpp @@ -222,7 +222,7 @@ bool KviKvsObject_file::functionopen(KviKvsObjectFunctionCall *c) { for ( int idx=0;idxwarning(__tr2qs("No such open mode: '%Q'"),&modes.at(idx)); @@ -335,7 +335,7 @@ bool KviKvsObject_file::functionunGetch(KviKvsObjectFunctionCall *c) { if (szChar.length()>1) c->warning(__tr2qs("Argument to long, using only first char")); const char *ch=szChar.toUtf8().data(); - if (m_pFile->ungetch(ch[0])<0) c->warning(__tr2qs("An error occured !"));// c->error ? + m_pFile->ungetChar(ch[0]); } return true; } @@ -352,7 +352,7 @@ bool KviKvsObject_file::functionreadBlock(KviKvsObjectFunctionCall *c) { char * buff = new char[uLen + 1]; m_pFile->flush(); // advice from QFile man page (to avoid trash) - int rlen = m_pFile->readBlock(buff, uLen); + int rlen = m_pFile->read(buff, uLen); buff[rlen] = '\0'; QString szBlock(buff); c->returnValue()->setString(szBlock); @@ -372,7 +372,7 @@ bool KviKvsObject_file::functionwriteBlock(KviKvsObjectFunctionCall *c) if(!m_pFile->isOpen()) c->warning(__tr("File is not open !")); const char *block=szBlock.toUtf8().data(); - int rlen = m_pFile->writeBlock(block, uLen); + int rlen = m_pFile->write(block, uLen); c->returnValue()->setInteger(rlen); m_pFile->flush(); return true; diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp index 77329062d..152e2f29c 100644 --- a/src/modules/objects/class_layout.cpp +++ b/src/modules/objects/class_layout.cpp @@ -244,7 +244,7 @@ bool KviKvsObject_layout::functionAddColSpacing(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol) KVSO_PARAMETER("spacing",KVS_PT_UNSIGNEDINTEGER,0,uSpacing) KVSO_PARAMETERS_END(c) - if (widget()) ((QGridLayout *)object())->addColSpacing(uCol,uSpacing); + if (widget()) ((QGridLayout *)object())->addItem(new QSpacerItem(uSpacing,0), 0, uCol); return true; } diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index 2bc49b36f..aa992eb26 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -1061,14 +1061,14 @@ bool KviKvsObject_mledit::functionloadFile(KviKvsObjectFunctionCall *c) } QFile file( szFile ); - if ( !file.open( IO_ReadOnly ) ) + if ( !file.open( QIODevice::ReadOnly ) ) { c->warning(__tr2qs(" I cannot read the file %Q'."),&szFile); return true; } QTextStream ts( &file ); - QString txt = ts.read(); + QString txt = ts.readAll(); if ( !Q3StyleSheet::mightBeRichText( txt ) ) txt = Q3StyleSheet::convertFromPlainText( txt, Q3StyleSheetItem::WhiteSpacePre ); ((KviTalMultiLineEdit *)widget())->setText( txt ); diff --git a/src/modules/objects/class_painter.h b/src/modules/objects/class_painter.h index 067bc6097..3229e2375 100644 --- a/src/modules/objects/class_painter.h +++ b/src/modules/objects/class_painter.h @@ -37,7 +37,7 @@ public: KVSO_DECLARE_OBJECT(KviKvsObject_painter) protected: QPainter * m_pPainter; - QWMatrix m_pMatrix; + QMatrix m_pMatrix; QLinearGradient *m_pGradient; QPainterPath *m_pPainterPath; public: diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp index 00864d5cb..d0390812c 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -152,7 +152,11 @@ bool KviKvsObject_pixmap::functionresize(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("width",KVS_PT_UNSIGNEDINTEGER,0,uWidth) KVSO_PARAMETER("height",KVS_PT_UNSIGNEDINTEGER,0,uHeight) KVSO_PARAMETERS_END(c) - m_pPixmap->resize(uWidth,uHeight); + if (m_pPixmap) + { + delete m_pPixmap; + m_pPixmap=new QPixmap(uWidth,uHeight); + } bPixmapModified=true; return true; } @@ -184,6 +188,7 @@ bool KviKvsObject_pixmap::functionwidth(KviKvsObjectFunctionCall *c) c->returnValue()->setInteger(m_pPixmap->width()); return true; } +// maybe DEPRECATED? bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c) { if(!m_pPixmap)return true; @@ -219,7 +224,7 @@ bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c) QImage *buffer=((KviKvsObject_pixmap *)pObDest)->getImage(); ((KviKvsObject_pixmap *)pObDest)->imageChanged(); if (bPixmapModified) { - *m_pImage=m_pPixmap->convertToImage(); + *m_pImage=m_pPixmap->toImage(); } if (uWidth>buffer->width() || uHeight>buffer->height()) { @@ -255,7 +260,7 @@ if(uXoffset+uWidth>m_pImage->width()) return true; } - buffer->setAlphaBuffer(true); +// buffer->setAlphaBuffer(true); int iHedge=uHeight?uHeight:m_pImage->height(); int iWedge=uWidth?uWidth:m_pImage->width(); @@ -285,7 +290,7 @@ if(uXoffset+uWidth>m_pImage->width()) QPixmap * KviKvsObject_pixmap::getPixmap() { if (bImageModified) { - m_pPixmap->convertFromImage(*m_pImage); + m_pPixmap->fromImage(*m_pImage); bImageModified=false; } return m_pPixmap; @@ -293,7 +298,7 @@ QPixmap * KviKvsObject_pixmap::getPixmap() QImage * KviKvsObject_pixmap::getImage() { if (bPixmapModified) { - *m_pImage=m_pPixmap->convertToImage(); + *m_pImage=m_pPixmap->toImage(); //debug ("image info2 %d and %d",test.width(),test.height()); bPixmapModified=false; diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index 9a962e968..a64e63681 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -119,7 +119,7 @@ bool KviKvsObject_radiobutton::functionSetImage(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if (!widget()) return true; QPixmap * pix = g_pIconManager->getImage(icon); - if(pix)widget()->setIcon(*pix); + if(pix)((QRadioButton *)widget())->setIcon(*pix); return true; } bool KviKvsObject_radiobutton::function_toggleEvent(KviKvsObjectFunctionCall *c) diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp index 152bbf7a1..d7f966732 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -242,17 +242,17 @@ bool KviKvsObject_slider::functionsetTickmarks(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if(!widget())return true; if(KviQString::equalCI(szTick,"NoMarks")) - ((QSlider *)widget())->setTickPosition(QSlider::NoMarks); + ((QSlider *)widget())->setTickPosition(QSlider::NoTicks); else if(KviQString::equalCI(szTick,"Both")) - ((QSlider *)widget())->setTickPosition(QSlider::Both); + ((QSlider *)widget())->setTickPosition(QSlider::TicksBothSides); else if(KviQString::equalCI(szTick,"Above")) - ((QSlider *)widget())->setTickPosition(QSlider::Above); + ((QSlider *)widget())->setTickPosition(QSlider::TicksAbove); else if(KviQString::equalCI(szTick,"Below")) - ((QSlider *)widget())->setTickPosition(QSlider::Below); + ((QSlider *)widget())->setTickPosition(QSlider::TicksBelow); else if(KviQString::equalCI(szTick,"Left")) - ((QSlider *)widget())->setTickPosition(QSlider::Left); + ((QSlider *)widget())->setTickPosition(QSlider::TicksLeft); else if(KviQString::equalCI(szTick,"Right")) - ((QSlider *)widget())->setTickPosition(QSlider::Right); + ((QSlider *)widget())->setTickPosition(QSlider::TicksRight); else c->warning( __tr2qs("Unknown tickmark '%Q'"),&szTick); return true; } diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index aabfdbcda..978e9e7b2 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -606,12 +606,12 @@ bool KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c) #endif { debug ("ok connecting"); - debug ("connectinhg on ip %s ",m_szRemoteIp.latin1()); + debug ("connectinhg on ip %s ",m_szRemoteIp.toUtf8().data()); debug ("non so ip"); m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTING; delayedConnect(); } else { - debug ("connectinhg on ip %s port %d",m_szRemoteIp.latin1(),m_uRemotePort); + debug ("connectinhg on ip %s port %d",m_szRemoteIp.toUtf8().data(),m_uRemotePort); m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DNS; delayedLookupRemoteIp(); } @@ -858,7 +858,9 @@ void KviKvsObject_socket::delayedConnect() if(m_pDelayTimer)delete m_pDelayTimer; m_pDelayTimer = new QTimer(); connect(m_pDelayTimer,SIGNAL(timeout()),this,SLOT(doConnect())); - m_pDelayTimer->start(0,true); + m_pDelayTimer->setInterval(0); + m_pDelayTimer->setSingleShot(true); + m_pDelayTimer->start(); } void KviKvsObject_socket::doConnect() @@ -952,7 +954,9 @@ debug ("Socket created"); debug ("Socket connected"); m_pDelayTimer = new QTimer(); connect(m_pDelayTimer,SIGNAL(timeout()),this,SLOT(connectTimeout())); - m_pDelayTimer->start(m_uConnectTimeout,true); + m_pDelayTimer->setInterval(m_uConnectTimeout); + m_pDelayTimer->setSingleShot(true); + m_pDelayTimer->start(); m_pSn = new QSocketNotifier((int)m_sock,QSocketNotifier::Write); QObject::connect(m_pSn,SIGNAL(activated(int)),this,SLOT(writeNotifierFired(int))); @@ -974,7 +978,10 @@ void KviKvsObject_socket::delayedLookupRemoteIp() if(m_pDelayTimer)delete m_pDelayTimer; m_pDelayTimer = new QTimer(); connect(m_pDelayTimer,SIGNAL(timeout()),this,SLOT(lookupRemoteIp())); - m_pDelayTimer->start(0,true); + + m_pDelayTimer->setInterval(0); + m_pDelayTimer->setSingleShot(true); + m_pDelayTimer->start(); } void KviKvsObject_socket::lookupRemoteIp() @@ -1011,7 +1018,7 @@ void KviKvsObject_socket::lookupDone(KviDns *pDns) return; } m_szRemoteIp = pDns->firstIpAddress(); - debug ("Dns resolved in %s",m_szRemoteIp.latin1()); + debug ("Dns resolved in %s",m_szRemoteIp.toUtf8().data()); delete m_pDns; m_pDns = 0; diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp index eb78f3db9..8aa46542d 100644 --- a/src/modules/objects/class_spinbox.cpp +++ b/src/modules/objects/class_spinbox.cpp @@ -153,7 +153,7 @@ bool KviKvsObject_spinbox::functionsetMinValue(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("min_value",KVS_PT_INT,0,iMinvalue) KVSO_PARAMETERS_END(c) - if (widget()) ((QSpinBox *)widget())->setMinValue(iMinvalue); + if (widget()) ((QSpinBox *)widget())->setMinimum(iMinvalue); return true; } bool KviKvsObject_spinbox::functionsetMaxValue(KviKvsObjectFunctionCall *c) @@ -162,7 +162,7 @@ bool KviKvsObject_spinbox::functionsetMaxValue(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("max_value",KVS_PT_INT,0,iMaxvalue) KVSO_PARAMETERS_END(c) - if (widget()) ((QSpinBox *)widget())->setMaxValue(iMaxvalue); + if (widget()) ((QSpinBox *)widget())->setMaximum(iMaxvalue); return true; } @@ -172,7 +172,7 @@ bool KviKvsObject_spinbox::functionsetLineStep(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("line_step",KVS_PT_INT,0,iLinestep) KVSO_PARAMETERS_END(c) - if (widget()) ((QSpinBox *)widget())->setLineStep(iLinestep); + if (widget()) ((QSpinBox *)widget())->setSingleStep(iLinestep); return true; } @@ -185,12 +185,12 @@ bool KviKvsObject_spinbox::functionvalue(KviKvsObjectFunctionCall *c) bool KviKvsObject_spinbox::functionminValue(KviKvsObjectFunctionCall *c) { - if (widget()) c->returnValue()->setInteger(((QSpinBox *)widget())->minValue()); + if (widget()) c->returnValue()->setInteger(((QSpinBox *)widget())->minimum()); return true; } bool KviKvsObject_spinbox::functionmaxValue(KviKvsObjectFunctionCall *c) { - if (widget()) c->returnValue()->setInteger(((QSpinBox *)widget())->maxValue()); + if (widget()) c->returnValue()->setInteger(((QSpinBox *)widget())->maximum()); return true; } bool KviKvsObject_spinbox::functionlineStep(KviKvsObjectFunctionCall *c) diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index 82ca4ceaa..f526c59ed 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -247,7 +247,7 @@ bool KviKvsObject_tabwidget::functioninsertTab(KviKvsObjectFunctionCall *c) } QPixmap * pix = g_pIconManager->getImage(szIcon); if(pix){ - ((QTabWidget *)widget())->insertTab( (iIndex,(QWidget *)(ob->object())),QIcon(*pix),szLabel); + ((QTabWidget *)widget())->insertTab(iIndex,(QWidget *)(ob->object()),QIcon(*pix),szLabel); } else ((QTabWidget *)widget())->insertTab(iIndex,((QWidget *)(ob->object())),szLabel); return true; @@ -259,7 +259,7 @@ bool KviKvsObject_tabwidget::functionsetCurrentPage(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIndex) KVSO_PARAMETERS_END(c) - if (widget()) ((QTabWidget *)widget())->setCurrentPage(iIndex); + if (widget()) ((QTabWidget *)widget())->setCurrentIndex(iIndex); return true; } bool KviKvsObject_tabwidget::functionsetTabToolTip(KviKvsObjectFunctionCall *c) @@ -483,9 +483,9 @@ bool KviKvsObject_tabwidget::functionsetTabPosition(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if(!widget())return true; if(KviQString::equalCI(szPos,"Top")) - ((QTabWidget *)widget())->setTabPosition(QTabWidget::Top); + ((QTabWidget *)widget())->setTabPosition(QTabWidget::North); else if(KviQString::equalCI(szPos,"Bottom")) - ((QTabWidget *)widget())->setTabPosition(QTabWidget::Bottom); + ((QTabWidget *)widget())->setTabPosition(QTabWidget::South); else c->warning( __tr2qs("Unknown position 'Q%'"),&szPos); return true; } diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp index 73bfbc6dc..cc9632372 100644 --- a/src/modules/objects/class_tbrowser.cpp +++ b/src/modules/objects/class_tbrowser.cpp @@ -100,7 +100,7 @@ bool KviKvsObject_textbrowser::function_setSource(KviKvsObjectFunctionCall *c) return true; } QUrl url; - url.setFileName(szFile); + url.setPath(szFile); if (widget()) ((QTextBrowser *)widget())->setSource(url); return true; } diff --git a/src/modules/objects/class_urllabel.cpp b/src/modules/objects/class_urllabel.cpp index d75f09018..173ad9561 100644 --- a/src/modules/objects/class_urllabel.cpp +++ b/src/modules/objects/class_urllabel.cpp @@ -196,7 +196,7 @@ bool KviKvsObject_urlabel::eventFilter(QObject * o, QEvent * e) switch(e->type()) { case QEvent::Enter: - pal.setColor(QColorGroup::Foreground, m_enterClr); + pal.setColor(QPalette::Foreground, m_enterClr); break; case QEvent::Leave: // this doesn't work... diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index 51fbd5963..90aea125e 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -81,13 +81,11 @@ const char * const widgettypes_tbl[] = { "Dialog", "Popup", "Desktop", - "Customize", "Title", "StaysOnTop", "SysMenu", "Minimize", "Maximize", - "NoAutoErase" }; const Qt::WidgetAttribute widgetattributes_cod[] = { @@ -140,17 +138,15 @@ const char * const colorrole_tbl[] = { const Qt::WindowType widgettypes_cod[] = { - Qt::WType_TopLevel, - Qt::WType_Dialog, - Qt::WType_Popup, - Qt::WType_Desktop, - Qt::WStyle_Customize, - Qt::WStyle_Title, - Qt::WStyle_StaysOnTop, - Qt::WStyle_SysMenu, - Qt::WStyle_Minimize, - Qt::WStyle_Maximize, - Qt::WNoAutoErase + Qt::Window, + Qt::Dialog, + Qt::Popup, + Qt::Desktop, + Qt::WindowTitleHint, + Qt::WindowStaysOnTopHint, + Qt::WindowSystemMenuHint, + Qt::WindowMinimizeButtonHint, + Qt::WindowMaximizeButtonHint, }; #define QT_WIDGET_TABFOCUS Qt::TabFocus @@ -411,10 +407,6 @@ const Qt::WindowType widgettypes_cod[] = { Dialog - indicates that this widget is a top-level window that should be decorated as a dialog[br] Desktop - indicates that this widget is the desktop[br] Popup - indicates that this widget is a popup top-level window[br] - NoAutoErase - indicates that this widget paints all its pixels. Updating, resizing, scrolling and focus changes should therefore not erase the widget. - Customize - let's the user to customize the style of the widget.[br] - [br] - Valid parameter for a customized widget are:[br] Title - gives the window a title bar[br] StaysOnTop - window stays on top [br] SysMenu - add a windows system menu[br] @@ -901,13 +893,13 @@ bool KviKvsObject_widget::eventFilter(QObject *o,QEvent *e) break; case QEvent::MouseMove: - if( (((QMouseEvent *)e)->state()) & Qt::LeftButton) aparam = 0; + if( (((QMouseEvent *)e)->button()) & Qt::LeftButton) aparam = 0; else { - if(((QMouseEvent *)e)->state() & Qt::RightButton)aparam = 1; + if(((QMouseEvent *)e)->button() & Qt::RightButton)aparam = 1; else { - if(((QMouseEvent *)e)->state() & Qt::MidButton)aparam = 2; + if(((QMouseEvent *)e)->button() & Qt::MidButton)aparam = 2; else aparam = -1; } } @@ -1029,7 +1021,7 @@ bool KviKvsObject_widget::function_repaint(KviKvsObjectFunctionCall * c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) if(!widget()) return true; - widget()->repaint(bEnabled); + widget()->repaint(); return true; } @@ -1766,8 +1758,8 @@ bool KviKvsObject_widget::function_reparent(KviKvsObjectFunctionCall *c) if(!widget()) return true; if(!ob) { - widget()->reparent(0,QPoint(widget()->x(),widget()->y())); - return true; + setParent(0); + return true; } else if(!ob->object()->isWidgetType()) @@ -1775,7 +1767,9 @@ bool KviKvsObject_widget::function_reparent(KviKvsObjectFunctionCall *c) c->warning(__tr("Parent must be a widget object")); return true; } - widget()->reparent(((QWidget *)(ob->object())),QPoint(((QWidget *)(ob->object()))->x(),((QWidget *)(ob->object()))->y())); + setParent(((QWidget *)(ob->object()))); + +// widget()->reparent(((QWidget *)(ob->object())),QPoint(((QWidget *)(ob->object()))->x(),((QWidget *)(ob->object()))->y())); return true; } diff --git a/src/modules/objects/objects.vcproj b/src/modules/objects/objects.vcproj index 8360e61bf..02944c770 100755 --- a/src/modules/objects/objects.vcproj +++ b/src/modules/objects/objects.vcproj @@ -1,1023 +1,1275 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/options/options_QT4_vc05.vcproj b/src/modules/options/options_QT4_vc05.vcproj index 1e05435d4..49876b10c 100644 --- a/src/modules/options/options_QT4_vc05.vcproj +++ b/src/modules/options/options_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvilib\net";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPTIONS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPTIONS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp index d7ee2f1bb..dd917c0b1 100644 --- a/src/modules/theme/packthemedialog.cpp +++ b/src/modules/theme/packthemedialog.cpp @@ -336,9 +336,9 @@ void KviPackThemeDialog::imageSelectionChanged(const QString &szImagePath) { QPixmap out; if(pix.width() > 300 || pix.height() > 225) - out.convertFromImage(pix.scaled(300,225,Qt::KeepAspectRatio,Qt::SmoothTransformation)); + out.fromImage(pix.scaled(300,225,Qt::KeepAspectRatio,Qt::SmoothTransformation)); else - out.convertFromImage(pix); + out.fromImage(pix); m_pImageLabel->setPixmap(out); return; } @@ -371,9 +371,9 @@ bool KviPackThemeDialog::packTheme() if(!pix.isNull()) { if(pix.width() > 300 || pix.height() > 225) - out.convertFromImage(pix.scaled(300,225,Qt::KeepAspectRatio)); + out.fromImage(pix.scaled(300,225,Qt::KeepAspectRatio)); else - out.convertFromImage(pix); + out.fromImage(pix); } else { if(!m_szImagePath.isEmpty()) { -- cgit v1.3.1-10-gc9f91