diff options
Diffstat (limited to 'src')
34 files changed, 218 insertions, 184 deletions
diff --git a/src/modules/addon/addon_QT4_vc05.vcproj b/src/modules/addon/addon_QT4_vc05.vcproj index 2262d5277..20151f975 100644 --- a/src/modules/addon/addon_QT4_vc05.vcproj +++ b/src/modules/addon/addon_QT4_vc05.vcproj @@ -268,6 +268,15 @@ RelativePath=".\packaddondialog.h"
>
<FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\moc_$(InputName).cpp" "$(InputDir)\$(InputFileName)""
+ Outputs="$(InputDir)\moc_$(InputName).cpp"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="Release|Win32"
>
<Tool
diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp index 90d2dd295..8eaffdf9e 100644 --- a/src/modules/codetester/codetester.cpp +++ b/src/modules/codetester/codetester.cpp @@ -50,7 +50,7 @@ KviCodeTester::KviCodeTester(QWidget * par) setObjectName("code_tester"); QGridLayout * g = new QGridLayout(this); m_pEditor = KviScriptEditor::createInstance(this); - g->addWidget(m_pEditor,0,0,0,4); + g->addWidget(m_pEditor,0,0,1,4); //g->addMultiCellWidget(m_pEditor,0,0,0,3); m_pExecuteButton = new QPushButton(__tr2qs("&Execute"),this); g->addWidget(m_pExecuteButton,1,3); diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 10d43e722..683f7677f 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -212,7 +212,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput( : QDialog(), KviKvsCallbackObject("dialog.textinput",pWindow,szCode,pMagicParams,0) { g_pDialogModuleDialogList->append(this); - setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC))); + setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC))); setModal(modal); setWindowTitle(szCaption); @@ -230,7 +230,8 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput( g->addWidget(tl,0,1); } else { QLabel * tl = new QLabel(szLabel,this); - g->addMultiCellWidget(tl,0,0,0,1); + g->addWidget(tl,0,0,0,2); + // g->addMultiCellWidget(tl,0,0,0,1); } g->setColumnStretch(1,1); @@ -245,11 +246,12 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput( m_pEdit = new QLineEdit(this); ((QLineEdit *)m_pEdit)->setText(szDefaultText); } - - g->addMultiCellWidget(m_pEdit,1,1,0,1); + g->addWidget(m_pEdit,1,1,0,1); +// g->addMultiCellWidget(m_pEdit,1,1,0,1); KviTalHBox * box = new KviTalHBox(this); - g->addMultiCellWidget(box,2,2,0,1); + g->addWidget(box,2,2,0,0); +// g->addMultiCellWidget(box,2,2,0,1); m_iEscapeButton = 0; m_iDefaultButton = 0; @@ -505,7 +507,7 @@ void KviKvsCallbackFileDialog::done(int code) #ifdef COMPILE_KDE_SUPPORT if(mode() == KFile::ExistingOnly) #else - if(mode() == QFileDialog::ExistingFiles) + if(fileMode() == QFileDialog::ExistingFiles) #endif { KviKvsArray * a = new KviKvsArray(); @@ -518,7 +520,7 @@ void KviKvsCallbackFileDialog::done(int code) } params.append(new KviKvsVariant(a)); } else { - params.append(new KviKvsVariant(selectedFile())); + params.append(new KviKvsVariant(selectedFiles().at(0))); } } else { params.append(new KviKvsVariant(QString(""))); @@ -871,7 +873,6 @@ static bool dialog_module_init(KviModule * m) KVSM_REGISTER_CALLBACK_COMMAND(m,"textinput",dialog_kvs_cmd_textinput); KVSM_REGISTER_CALLBACK_COMMAND(m,"file",dialog_kvs_cmd_file); KVSM_REGISTER_CALLBACK_COMMAND(m,"image",dialog_kvs_cmd_image); - KVSM_REGISTER_FUNCTION(m,"yesno",dialog_kvs_fnc_yesno); return true; diff --git a/src/modules/perl/perl_QT4_vc05.vcproj b/src/modules/perl/perl_QT4_vc05.vcproj index 8b4c526d8..74af3e9ef 100644 --- a/src/modules/perl/perl_QT4_vc05.vcproj +++ b/src/modules/perl/perl_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
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)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PERL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PERL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -135,7 +135,7 @@ EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
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)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
StringPooling="true"
MinimalRebuild="true"
ExceptionHandling="1"
diff --git a/src/modules/perlcore/perlcore_QT4_vc05.vcproj b/src/modules/perlcore/perlcore_QT4_vc05.vcproj index fcb1322f0..44551932d 100644 --- a/src/modules/perlcore/perlcore_QT4_vc05.vcproj +++ b/src/modules/perlcore/perlcore_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\tal";"$(PERLDIR)\lib\CORE";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PERLCORE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PERLCORE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -135,7 +135,7 @@ EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\tal";"$(PERLDIR)\lib\CORE";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PERLCORE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PERLCORE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
StringPooling="true"
MinimalRebuild="true"
ExceptionHandling="1"
diff --git a/src/modules/regchan/regchan_QT4_vc05.vcproj b/src/modules/regchan/regchan_QT4_vc05.vcproj index 7dfbb0aaf..29c0a6e73 100644 --- a/src/modules/regchan/regchan_QT4_vc05.vcproj +++ b/src/modules/regchan/regchan_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REGCHAN_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REGCHAN_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -135,7 +135,7 @@ EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;REGCHAN_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;REGCHAN_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
StringPooling="true"
MinimalRebuild="true"
ExceptionHandling="1"
diff --git a/src/modules/reguser/reguser_QT4_vc05.vcproj b/src/modules/reguser/reguser_QT4_vc05.vcproj index 0582be108..f202d1a73 100644 --- a/src/modules/reguser/reguser_QT4_vc05.vcproj +++ b/src/modules/reguser/reguser_QT4_vc05.vcproj @@ -135,7 +135,7 @@ EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;REGUSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;REGUSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
StringPooling="true"
MinimalRebuild="true"
ExceptionHandling="1"
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp index 360e134bd..9718653ad 100644 --- a/src/modules/rijndael/libkvirijndael.cpp +++ b/src/modules/rijndael/libkvirijndael.cpp @@ -529,9 +529,9 @@ unsigned char * p = (unsigned char *)encoded.ptr(); while(outb < oute) { - Q_UINT32 * dd1 = (Q_UINT32 *)outb; + quint32 * dd1 = (quint32 *)outb; outb += 4; - Q_UINT32 * dd2 = (Q_UINT32 *)outb; + quint32 * dd2 = (quint32 *)outb; outb += 4; *p++ = fake_base64[*dd2 & 0x3f]; *dd2 >>= 6; *p++ = fake_base64[*dd2 & 0x3f]; *dd2 >>= 6; @@ -576,9 +576,9 @@ unsigned char * bufp = buf; while(p < e) { - Q_UINT32 * dw1 = (Q_UINT32 *)bufp; + quint32 * dw1 = (quint32 *)bufp; bufp += 4; - Q_UINT32 * dw2 = (Q_UINT32 *)bufp; + quint32 * dw2 = (quint32 *)bufp; bufp += 4; *dw2 = 0; for(i=0;i < 6;i++)*dw2 |= (fake_base64dec(*p++)) << (i * 6); diff --git a/src/modules/rijndael/rijndael_QT4_vc05.vcproj b/src/modules/rijndael/rijndael_QT4_vc05.vcproj index 0746dfcf8..7deb6a4a9 100644 --- a/src/modules/rijndael/rijndael_QT4_vc05.vcproj +++ b/src/modules/rijndael/rijndael_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;RIJNDAEL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;RIJNDAEL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
StringPooling="true"
MinimalRebuild="true"
ExceptionHandling="1"
@@ -156,7 +156,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="qtmain.lib kvilib.lib kvirc.lib qt3support4.lib qtcore4.lib qtgui4.lib"
+ AdditionalDependencies="qtmain.lib kvilib.lib kvirc.lib qtcore4.lib qtgui4.lib"
OutputFile="$(OutDir)/kvi$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(SSLLIBDIR)";"$(PERLDIR)\lib\CORE";"$(QTDIR)\lib";"$(SolutionDir)\win32build\bin";"$(ZLIBLIBDIR)""
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp index e20cf4546..df829915e 100644 --- a/src/modules/setup/libkvisetup.cpp +++ b/src/modules/setup/libkvisetup.cpp @@ -76,7 +76,7 @@ KVIMODULEEXPORTFUNC void setup_finish() KVI_OPTION_STRING(KviOption_stringIncomingPath) = g_szChoosenIncomingDirectory; // Reset the quit message and the real name... if they contain the KVIrc version // then probably the user hasn't even edited them. - if(KVI_OPTION_STRING(KviOption_stringQuitMessage).find("KVIrc",0,false) != -1) + if(KVI_OPTION_STRING(KviOption_stringQuitMessage).indexOf("KVIrc",0,Qt::CaseInsensitive) != -1) KVI_OPTION_STRING(KviOption_stringQuitMessage) = KVI_DEFAULT_QUIT_MESSAGE; // We deserve to change the user's part message in something nice :) KVI_OPTION_STRING(KviOption_stringPartMessage) = KVI_DEFAULT_PART_MESSAGE; diff --git a/src/modules/setup/setup_QT4_vc05.vcproj b/src/modules/setup/setup_QT4_vc05.vcproj index e96874734..b35fff540 100644 --- a/src/modules/setup/setup_QT4_vc05.vcproj +++ b/src/modules/setup/setup_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
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)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SETUP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SETUP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -135,7 +135,7 @@ EnableFiberSafeOptimizations="true"
WholeProgramOptimization="true"
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)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SETUP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SETUP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
StringPooling="true"
MinimalRebuild="true"
ExceptionHandling="1"
@@ -157,7 +157,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="kvilib.lib kvirc.lib qt3support4.lib qtgui4.lib qtcore4.lib ole32.lib advapi32.lib"
+ AdditionalDependencies="kvilib.lib kvirc.lib qtgui4.lib qtcore4.lib ole32.lib advapi32.lib"
OutputFile="$(OutDir)/kvi$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(SSLLIBDIR)";"$(PERLDIR)\lib\CORE";"$(QTDIR)\lib";"$(SolutionDir)\win32build\bin";"$(ZLIBLIBDIR)""
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 30271d302..3a817a7be 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -109,7 +109,7 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w) g->setColumnStretch(1,1); QLabel * l = new QLabel(m_pVBox); - l->setAlignment(Qt::AlignAuto | Qt::AlignTop); + l->setAlignment(Qt::AlignLeft | Qt::AlignTop); /* QString szHeader = "<table border=\"0\" cellpadding=\"4\" cellspacing=\"0\" style=\"margin:0px;padding:0px;\" width=\"100%\"><tr><td bgcolor=\"#303030\">" \ "<h1><font color=\"#FFFFFF\">KVIrc " KVI_VERSION "</font></h1>" \ @@ -118,9 +118,11 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w) QString szHeader = "<h1><font color=\"#FFFFFF\"> KVIrc " KVI_VERSION "</font></h1>"; l->setText(szHeader); l->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); - l->setAlignment(Qt::AlignAuto | Qt::AlignVCenter); + l->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); l->setMargin(0); - l->setBackgroundColor(QColor(48,48,48)); + QPalette p = l->palette(); + p.setColor(backgroundRole(), QColor(48,48,48)); + l->setPalette(p); m_pTextLabel = new QLabel(m_pVBox); m_pTextLabel->setWordWrap(true); @@ -261,9 +263,9 @@ KviSetupWizard::KviSetupWizard() #ifdef COMPILE_ON_WINDOWS tmp = QTextCodec::codecForLocale()->toUnicode(getenv( "APPDATA" )); if(tmp.isEmpty()) - tmp = QDir::homeDirPath(); + tmp = QDir::homePath(); #else - tmp = QDir::homeDirPath(); + tmp = QDir::homePath(); #endif //COMPILE_ON_WINDOWS KviQString::ensureLastCharIs(tmp,KVI_PATH_SEPARATOR_CHAR); tmp.append(KVI_LOCAL_KVIRC_SUBDIRECTORY_NAME); @@ -286,7 +288,7 @@ KviSetupWizard::KviSetupWizard() m_pNewIncomingBox->setSpacing(3); m_pNewIncomingBox->setStretchFactor(m_pIncomingPathEdit,1); - tmp = QDir::homeDirPath(); + tmp = QDir::homePath(); KviQString::ensureLastCharIs(tmp,KVI_PATH_SEPARATOR_CHAR); tmp.append(KVI_DEFAULT_INCOMING_SUBDIRECTORY_NAME); KviFileUtils::adjustFilePath(tmp); @@ -358,20 +360,20 @@ KviSetupWizard::KviSetupWizard() m_pAgeCombo = new QComboBox(hb); - m_pAgeCombo->insertItem(__tr2qs("Unspecified")); + m_pAgeCombo->insertItem(0,__tr2qs("Unspecified")); unsigned int i; for(i=1;i<120;i++) { QString tmp; tmp.setNum(i); - m_pAgeCombo->insertItem(tmp); + m_pAgeCombo->insertItem(m_pAgeCombo->count(),tmp); } bool bOk; i = KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge).toUInt(&bOk); if(!bOk)i = 0; if(i > 120)i = 120; - m_pAgeCombo->setCurrentItem(i); + m_pAgeCombo->setCurrentIndex(i); hb->setStretchFactor(m_pAgeCombo,1); @@ -384,16 +386,16 @@ KviSetupWizard::KviSetupWizard() m_pGenderCombo = new QComboBox(hb); - m_pGenderCombo->insertItem(__tr2qs("Unspecified")); - m_pGenderCombo->insertItem(__tr2qs("Female")); - m_pGenderCombo->insertItem(__tr2qs("Male")); + m_pGenderCombo->insertItem(0,__tr2qs("Unspecified")); + m_pGenderCombo->insertItem(1,__tr2qs("Female")); + m_pGenderCombo->insertItem(2,__tr2qs("Male")); if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender),"Male")) - m_pGenderCombo->setCurrentItem(2); + m_pGenderCombo->setCurrentIndex(2); else if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender),"Female")) - m_pGenderCombo->setCurrentItem(1); + m_pGenderCombo->setCurrentIndex(1); else - m_pGenderCombo->setCurrentItem(0); + m_pGenderCombo->setCurrentIndex(0); hb->setStretchFactor(m_pGenderCombo,1); @@ -938,13 +940,13 @@ void KviSetupWizard::accept() { QString szDir; - if(m_pDirUsePrev->isOn()) + if(m_pDirUsePrev->isChecked()) { bNeedToApplyDefaults=false; g_pApp->m_szLocalKvircDir = m_pOldDataPathEdit->text(); } else { bNeedToApplyDefaults=true; - if(m_pDirUseNew->isOn()) { + if(m_pDirUseNew->isChecked()) { szDir = m_pDataPathEdit->text(); } #ifdef COMPILE_ON_WINDOWS @@ -976,7 +978,7 @@ void KviSetupWizard::accept() g_pApp->m_szLocalKvircDir = szDir; KviFileUtils::adjustFilePath(g_pApp->m_szLocalKvircDir); - if(m_pDirUseNew->isOn()) { + if(m_pDirUseNew->isChecked()) { szDir = m_pIncomingPathEdit->text(); } #ifdef COMPILE_ON_WINDOWS @@ -1038,7 +1040,7 @@ void KviSetupWizard::accept() m_pLanguagesSelector->commit(); //m_pOtherInfoSelector->commit(); - KVI_OPTION_STRING(KviOption_stringNickname1).stripWhiteSpace(); + KVI_OPTION_STRING(KviOption_stringNickname1).trimmed(); KVI_OPTION_STRING(KviOption_stringNickname1).replace(" ",""); if(KVI_OPTION_STRING(KviOption_stringNickname1).length() > 32) @@ -1070,13 +1072,13 @@ void KviSetupWizard::accept() alt.append("2"); KVI_OPTION_STRING(KviOption_stringNickname4) = alt; - int i = m_pAgeCombo->currentItem(); + int i = m_pAgeCombo->currentIndex(); if(i < 0)i = 0; if(i > 120)i = 120; if(i <= 0)KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge) = ""; else KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge).setNum(i); - switch(m_pGenderCombo->currentItem()) + switch(m_pGenderCombo->currentIndex()) { case 1: // this should be in english @@ -1108,13 +1110,13 @@ void KviSetupWizard::accept() } */ #ifdef COMPILE_ON_WINDOWS - if(m_pUseMircServerList->isEnabled() && m_pUseMircServerList->isOn()) + if(m_pUseMircServerList->isEnabled() && m_pUseMircServerList->isChecked()) szMircServers = m_szMircServerIniFile; #endif } } #ifdef COMPILE_ON_WINDOWS - if(m_pDirMakePortable->isOn()) + if(m_pDirMakePortable->isChecked()) { KviFileUtils::writeFile(g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"portable","true"); } else { diff --git a/src/modules/sharedfile/sharedfile_QT4_vc05.vcproj b/src/modules/sharedfile/sharedfile_QT4_vc05.vcproj index 2387fcf8f..7ed927de4 100644 --- a/src/modules/sharedfile/sharedfile_QT4_vc05.vcproj +++ b/src/modules/sharedfile/sharedfile_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
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;_DEBUG;_WINDOWS;_USRDLL;SHAREDFILE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SHAREDFILE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index f679de1ff..5e72c4567 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -53,8 +53,11 @@ extern KviSharedFilesWindow * g_pSharedFilesWindow; extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager; KviSharedFileEditDialog::KviSharedFileEditDialog(QWidget * par,KviSharedFile * f) -: QDialog(par,"shared_file_editor",true) +: QDialog(par)//,"shared_file_editor",true) { + setModal(true); + setObjectName("shared_file_editor"); + QGridLayout * g = new QGridLayout(this); setWindowTitle(__tr2qs_ctx("Edit Shared File - KVIrc","sharedfileswindow")); @@ -63,13 +66,15 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(QWidget * par,KviSharedFile * f g->addWidget(l, 0, 0 ); m_pShareNameEdit = new QLineEdit(this); - g->addMultiCellWidget( m_pShareNameEdit, 0, 0, 1, 3 ); + g->addWidget(m_pShareNameEdit,0,1,1,3); + //g->addMultiCellWidget( m_pShareNameEdit, 0, 0, 1, 3 ); l = new QLabel(__tr2qs_ctx("File path:","sharedfileswindow"),this); g->addWidget(l, 1, 0 ); m_pFilePathEdit = new QLineEdit(this); - g->addMultiCellWidget( m_pFilePathEdit, 1, 1, 1, 2 ); + g->addWidget(m_pFilePathEdit,1,1,1,2); + //g->addMultiCellWidget( m_pFilePathEdit, 1, 1, 1, 2 ); m_pBrowseButton = new QPushButton(__tr2qs_ctx("&Browse...","sharedfileswindow"),this); g->addWidget( m_pBrowseButton, 1, 3 ); @@ -79,13 +84,15 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(QWidget * par,KviSharedFile * f g->addWidget(l, 2, 0 ); m_pUserMaskEdit = new QLineEdit(this); - g->addMultiCellWidget( m_pUserMaskEdit, 2, 2, 1, 3 ); + g->addWidget(m_pUserMaskEdit,2,1,1,3); +// g->addMultiCellWidget( m_pUserMaskEdit, 2, 2, 1, 3 ); m_pExpireCheckBox = new KviStyledCheckBox(__tr2qs_ctx("Expire at:","sharedfileswindow"),this); g->addWidget(m_pExpireCheckBox,3,0); m_pExpireDateTimeEdit = new QDateTimeEdit(this); - g->addMultiCellWidget(m_pExpireDateTimeEdit, 3, 3, 1, 3 ); + g->addWidget(m_pExpireDateTimeEdit,3,1,1,3); + //g->addMultiCellWidget(m_pExpireDateTimeEdit, 3, 3, 1, 3 ); connect(m_pExpireCheckBox,SIGNAL(toggled(bool)),m_pExpireDateTimeEdit,SLOT(setEnabled(bool))); @@ -181,8 +188,8 @@ void KviSharedFileEditDialog::okClicked() } -KviSharedFilesListViewItem::KviSharedFilesListViewItem(KviTalListView * lv,KviSharedFile * f) -: KviTalListViewItem(lv,f->name()) +KviSharedFilesTreeWidgetItem::KviSharedFilesTreeWidgetItem(KviTalTreeWidget * lv,KviSharedFile * f) +: KviTalTreeWidgetItem(lv,f->name()) { setText(1,f->absFilePath()); setText(2,f->userMask()); @@ -197,7 +204,7 @@ KviSharedFilesListViewItem::KviSharedFilesListViewItem(KviTalListView * lv,KviSh m_pSharedFilePointer = f; } -KviSharedFilesListViewItem::~KviSharedFilesListViewItem() +KviSharedFilesTreeWidgetItem::~KviSharedFilesTreeWidgetItem() { } @@ -206,19 +213,28 @@ KviSharedFilesWindow::KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviF : KviWindow(KVI_WINDOW_TYPE_TOOL,lpFrm,"shared files window",0) , KviModuleExtension(d) { g_pSharedFilesWindow = this; - m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter"); + m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter->setObjectName("sharedfiles_splitter"); KviTalVBox * vbox = new KviTalVBox(m_pSplitter); - m_pListView = new KviTalListView(vbox); - //m_pListView->header()->hide(); - m_pListView->setAllColumnsShowFocus(true); - m_pListView->addColumn(__tr2qs_ctx("Name","sharedfileswindow"),200); - m_pListView->addColumn(__tr2qs_ctx("Filename","sharedfileswindow"),300); - m_pListView->addColumn(__tr2qs_ctx("Mask","sharedfileswindow"),200); - m_pListView->addColumn(__tr2qs_ctx("Expires","sharedfileswindow"),200); - m_pListView->setSelectionMode(KviTalListView::Single); - connect(m_pListView,SIGNAL(selectionChanged()),this,SLOT(enableButtons())); + m_pTreeWidget = new KviTalTreeWidget(vbox); + //m_pTreeWidget->header()->hide(); + m_pTreeWidget->setAllColumnsShowFocus(true); + QStringList columsLabels; + columsLabels.append(__tr2qs_ctx("Name","sharedfileswindow")); + columsLabels.append(__tr2qs_ctx("Filename","sharedfileswindow")); + columsLabels.append(__tr2qs_ctx("Mask","sharedfileswindow")); + + columsLabels.append(__tr2qs_ctx("Expires","sharedfileswindow")); + m_pTreeWidget->setHeaderLabels(columsLabels); + m_pTreeWidget->setColumnWidth(0,200); + m_pTreeWidget->setColumnWidth(0,300); + m_pTreeWidget->setColumnWidth(0,300); + m_pTreeWidget->setColumnWidth(0,200); + + m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection); + connect(m_pTreeWidget,SIGNAL(itemSelectionChanged()),this,SLOT(enableButtons())); connect(g_pSharedFilesManager,SIGNAL(sharedFilesChanged()),this,SLOT(fillFileView())); connect(g_pSharedFilesManager,SIGNAL(sharedFileAdded(KviSharedFile *)),this,SLOT(sharedFileAdded(KviSharedFile *))); @@ -243,14 +259,14 @@ KviSharedFilesWindow::~KviSharedFilesWindow() void KviSharedFilesWindow::enableButtons() { - KviTalListViewItem * it = m_pListView->currentItem(); + KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *)m_pTreeWidget->currentItem(); m_pEditButton->setEnabled(it); m_pRemoveButton->setEnabled(it); } void KviSharedFilesWindow::removeClicked() { - KviSharedFilesListViewItem * it = (KviSharedFilesListViewItem *)m_pListView->currentItem(); + KviSharedFilesTreeWidgetItem * it = (KviSharedFilesTreeWidgetItem *)m_pTreeWidget->currentItem(); if(!it)return; g_pSharedFilesManager->removeSharedFile(it->readOnlySharedFilePointer()->name(),it->readOnlySharedFilePointer()); @@ -268,13 +284,13 @@ void KviSharedFilesWindow::addClicked() void KviSharedFilesWindow::editClicked() { - KviSharedFilesListViewItem * it = (KviSharedFilesListViewItem *)m_pListView->currentItem(); + KviSharedFilesTreeWidgetItem * it = (KviSharedFilesTreeWidgetItem *)m_pTreeWidget->currentItem(); if(!it)return; KviSharedFileEditDialog dlg(0,it->readOnlySharedFilePointer()); if(dlg.exec() != QDialog::Accepted)return; - KviSharedFilesListViewItem * it2 = (KviSharedFilesListViewItem *)m_pListView->currentItem(); + KviSharedFilesTreeWidgetItem * it2 = (KviSharedFilesTreeWidgetItem *)m_pTreeWidget->currentItem(); if(it2 != it)return; // ooops ? KviSharedFile * f = dlg.getResult(); if(!f)return; // ooops 2 ? @@ -285,16 +301,16 @@ void KviSharedFilesWindow::editClicked() void KviSharedFilesWindow::fillFileView() { - m_pListView->clear(); + m_pTreeWidget->clear(); KviPointerHashTableIterator<QString,KviSharedFileList> it(*(g_pSharedFilesManager->sharedFileListDict())); - KviSharedFilesListViewItem * itm; + KviSharedFilesTreeWidgetItem * itm; while(KviSharedFileList * l = it.current()) { for(KviSharedFile * o = l->first();o;o = l->next()) { - itm = new KviSharedFilesListViewItem(m_pListView,o); + itm = new KviSharedFilesTreeWidgetItem(m_pTreeWidget,o); } ++it; } @@ -303,22 +319,24 @@ void KviSharedFilesWindow::fillFileView() void KviSharedFilesWindow::sharedFileAdded(KviSharedFile * f) { - KviSharedFilesListViewItem * it; - it = new KviSharedFilesListViewItem(m_pListView,f); + KviSharedFilesTreeWidgetItem * it; + it = new KviSharedFilesTreeWidgetItem(m_pTreeWidget,f); enableButtons(); } void KviSharedFilesWindow::sharedFileRemoved(KviSharedFile * f) { - KviTalListViewItem * it = m_pListView->firstChild(); - while(it) + KviTalTreeWidgetItem * it; + for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++) +// while(it) { - if(((KviSharedFilesListViewItem *)it)->readOnlySharedFilePointer() == f) + it=(KviTalTreeWidgetItem *) m_pTreeWidget->topLevelItem(i); + if(((KviSharedFilesTreeWidgetItem *)it)->readOnlySharedFilePointer() == f) { - delete ((KviSharedFilesListViewItem *)it); + delete ((KviSharedFilesTreeWidgetItem *)it); return; } - it = it->nextSibling(); + // it = it->nextSibling(); } enableButtons(); } @@ -329,10 +347,10 @@ void KviSharedFilesWindow::sharedFileRemoved(KviSharedFile * f) void KviSharedFilesWindow::tipRequest(KviDynamicToolTip * tip,const QPoint &pnt) { - KviSharedFilesItem * it = (KviSharedFilesItem *)m_pListView->itemAt(pnt); + KviSharedFilesItem * it = (KviSharedFilesItem *)m_pTreeWidget->itemAt(pnt); if(!it)return; QString txt = it->transfer()->tipText(); - tip->tip(m_pListView->itemRect(it),txt); + tip->tip(m_pTreeWidget->itemRect(it),txt); } */ @@ -344,14 +362,14 @@ void KviSharedFilesWindow::fillTransferView() KviSharedFilesItem * it; for(KviSharedFiles * t = l->first();t;t = l->next()) { - it = new KviSharedFilesItem(m_pListView,t); + it = new KviSharedFilesItem(m_pTreeWidget,t); t->setDisplayItem(it); } } KviSharedFilesItem * KviSharedFilesWindow::findItem(KviSharedFiles * t) { - KviSharedFilesItem * it = (KviSharedFilesItem *)m_pListView->firstChild(); + KviSharedFilesItem * it = (KviSharedFilesItem *)m_pTreeWidget->firstChild(); while(it) { if(it->transfer() == t)return it; @@ -362,7 +380,7 @@ KviSharedFilesItem * KviSharedFilesWindow::findItem(KviSharedFiles * t) void KviSharedFilesWindow::transferRegistered(KviSharedFiles * t) { - KviSharedFilesItem * it = new KviSharedFilesItem(m_pListView,t); + KviSharedFilesItem * it = new KviSharedFilesItem(m_pTreeWidget,t); //t->setDisplayItem(it); } @@ -373,7 +391,7 @@ void KviSharedFilesWindow::transferUnregistering(KviSharedFiles * t) if(it)delete it; } -void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const QPoint &pnt,int col) +void KviSharedFilesWindow::rightButtonPressed(KviTalTreeWidgetItem *it,const QPoint &pnt,int col) { if(!m_pContextPopup)m_pContextPopup = new KviTalPopupMenu(this); if(!m_pLocalFilePopup)m_pLocalFilePopup = new KviTalPopupMenu(this); @@ -463,7 +481,7 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const QPoin bool bHaveTerminated = false; - KviSharedFilesItem * item = (KviSharedFilesItem *)m_pListView->firstChild(); + KviSharedFilesItem * item = (KviSharedFilesItem *)m_pTreeWidget->firstChild(); while(item) { if(item->transfer()->terminated()) @@ -486,7 +504,7 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const QPoin KviSharedFiles * KviSharedFilesWindow::selectedTransfer() { - KviTalListViewItem * it = m_pListView->selectedItem(); + KviTalTreeWidgetItem * it = m_pTreeWidget->selectedItem(); if(!it)return 0; KviSharedFilesItem * i = (KviSharedFilesItem *)it; return i->transfer(); @@ -620,25 +638,25 @@ void KviSharedFilesWindow::openLocalFileFolder() void KviSharedFilesWindow::heartbeat() { - if(m_pListView->childCount() < 1)return; + if(m_pTreeWidget->childCount() < 1)return; - KviTalListViewItem * i1; - KviTalListViewItem * i2; + KviTalTreeWidgetItem * i1; + KviTalTreeWidgetItem * i2; - i1 = m_pListView->itemAt(QPoint(1,1)); + i1 = m_pTreeWidget->itemAt(QPoint(1,1)); if(!i1) { - m_pListView->viewport()->update(); + m_pTreeWidget->viewport()->update(); return; } - i2 = m_pListView->itemAt(QPoint(1,m_pListView->viewport()->height() - 2)); + i2 = m_pTreeWidget->itemAt(QPoint(1,m_pTreeWidget->viewport()->height() - 2)); if(i2)i2 = i2->nextSibling(); while(i1 && (i1 != i2)) { if(((KviSharedFilesItem *)i1)->transfer()->active()) { - m_pListView->repaintItem(i1); + m_pTreeWidget->repaintItem(i1); } i1 = i1->nextSibling(); } diff --git a/src/modules/sharedfileswindow/sharedfileswindow.h b/src/modules/sharedfileswindow/sharedfileswindow.h index 1e76a3ec9..7fa4f7860 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.h +++ b/src/modules/sharedfileswindow/sharedfileswindow.h @@ -31,7 +31,7 @@ #include "kvi_moduleextension.h" #include "kvi_sharedfiles.h" #include "kvi_styled_controls.h" -#include "kvi_tal_listview.h" +#include "kvi_tal_treewidget.h" #include <QDialog> @@ -41,11 +41,11 @@ class QLabel; class QLineEdit; class QPushButton; -class KviSharedFilesListViewItem : public KviTalListViewItem +class KviSharedFilesTreeWidgetItem : public KviTalTreeWidgetItem { public: - KviSharedFilesListViewItem(KviTalListView * lv,KviSharedFile * f); - ~KviSharedFilesListViewItem(); + KviSharedFilesTreeWidgetItem(KviTalTreeWidget * lv,KviSharedFile * f); + ~KviSharedFilesTreeWidgetItem(); protected: KviSharedFile * m_pSharedFilePointer; // THIS IS READ ONLY! public: @@ -84,7 +84,7 @@ public: protected: QSplitter * m_pVertSplitter; - KviTalListView * m_pListView; + KviTalTreeWidget * m_pTreeWidget; QPushButton * m_pRemoveButton; QPushButton * m_pEditButton; diff --git a/src/modules/sharedfileswindow/sharedfileswindow_QT4_vc05.vcproj b/src/modules/sharedfileswindow/sharedfileswindow_QT4_vc05.vcproj index a8f7adcf7..9b8201b94 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow_QT4_vc05.vcproj +++ b/src/modules/sharedfileswindow/sharedfileswindow_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;SHAREDFILESWINDOW_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SHAREDFILESWINDOW_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
StringPooling="true"
MinimalRebuild="true"
ExceptionHandling="1"
diff --git a/src/modules/snd/snd_QT4_vc05.vcproj b/src/modules/snd/snd_QT4_vc05.vcproj index 88ba18ad7..6ef21f745 100644 --- a/src/modules/snd/snd_QT4_vc05.vcproj +++ b/src/modules/snd/snd_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
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)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SND_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SND_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
diff --git a/src/modules/socketspy/socketspy_QT4_vc05.vcproj b/src/modules/socketspy/socketspy_QT4_vc05.vcproj index fcce3a017..595e9b1bf 100644 --- a/src/modules/socketspy/socketspy_QT4_vc05.vcproj +++ b/src/modules/socketspy/socketspy_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
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;_DEBUG;_WINDOWS;_USRDLL;SOCKETSPY_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOCKETSPY_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp index f0460aba3..5dc10b53a 100644 --- a/src/modules/socketspy/socketspywindow.cpp +++ b/src/modules/socketspy/socketspywindow.cpp @@ -38,7 +38,8 @@ KviSocketSpyWindow::KviSocketSpyWindow(KviFrame * lpFrm,KviConsole * lpConsole) : KviWindow(KVI_WINDOW_TYPE_SOCKETSPY,lpFrm,"socket_spy",lpConsole) , KviIrcDataStreamMonitor(lpConsole->context()) { g_pSocketSpyWindowList->append(this); - m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter"); + m_pSplitter = new QSplitter(Qt::Horizontal,this); + setObjectName("spysocket_splitter"); m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); // Ensure proper focusing //setFocusHandler(m_pIrcView,this); @@ -81,15 +82,15 @@ void KviSocketSpyWindow::fillCaptionBuffers() KviQString::sprintf(m_szHtmlActiveCaption, __tr2qs("<nobr><font color=\"%s\"><b>Socket Spy</b></font> " \ "<font color=\"%s\">[IRC Context %u]</font></nobr>"), - KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii(), - KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().ascii(), + KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii(), + KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().toAscii(), m_pConsole->ircContextId()); KviQString::sprintf(m_szHtmlInactiveCaption, __tr2qs("<nobr><font color=\"%s\"><b>Socket Spy</b></font> " \ "<font color=\"%s\">[IRC Context %u]</font></nobr>"), - KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii(), - KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().ascii(), + KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii(), + KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().toAscii(), m_pConsole->ircContextId()); } diff --git a/src/modules/spaste/controller.cpp b/src/modules/spaste/controller.cpp index 438b82938..15a054697 100644 --- a/src/modules/spaste/controller.cpp +++ b/src/modules/spaste/controller.cpp @@ -64,7 +64,7 @@ bool SPasteController::pasteFileInit(QString &fileName) if(m_pClipBuff)return false; // can't paste a file while pasting the clipboard if(m_pFile)return false; // can't paste two files at a time m_pFile = new QFile(fileName); - if(!m_pFile->open(IO_ReadOnly))return false; + if(!m_pFile->open(QIODevice::ReadOnly))return false; connect(m_pTimer,SIGNAL(timeout()),this,SLOT(pasteFile())); m_pTimer->start(KVI_OPTION_UINT(KviOption_uintPasteDelay)); return true; @@ -76,9 +76,9 @@ bool SPasteController::pasteClipboardInit(void) QString tmp(g_pApp->clipboard()->text()); if(m_pClipBuff) { - (*m_pClipBuff) += QStringList::split("\n",tmp,true); + (*m_pClipBuff) += tmp.isEmpty()?QStringList():tmp.split("\n",QString::KeepEmptyParts); } else { - m_pClipBuff = new QStringList(QStringList::split("\n",tmp,true)); + m_pClipBuff = new QStringList(tmp.isEmpty()?QStringList():tmp.split("\n",QString::KeepEmptyParts)); m_clipBuffIterator = m_pClipBuff->begin(); } connect(m_pTimer,SIGNAL(timeout()),this,SLOT(pasteClipboard())); @@ -99,7 +99,7 @@ void SPasteController::pasteClipboard(void) delete this; else { if((*m_clipBuffIterator).isEmpty())(*m_clipBuffIterator) = QChar(KVI_TEXT_RESET); - m_pWindow->ownMessage((*m_clipBuffIterator).ascii()); // <-- not good :/ + m_pWindow->ownMessage((*m_clipBuffIterator).toAscii()); // <-- not good :/ ++m_clipBuffIterator; } } else delete this;//Clipboard finished diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp index 41fcf2023..5e5beb32b 100644 --- a/src/modules/spaste/libkvispaste.cpp +++ b/src/modules/spaste/libkvispaste.cpp @@ -101,15 +101,17 @@ static bool spaste_kvs_cmd_file(KviKvsModuleCommandCall * c) KviWindow * window = spaste_kvs_find_window(szWindow,c); if( (!window) || window->console()->isNotConnected())return false; - - if(szFile.isEmpty() || (!KviFileUtils::fileExists(szFile.ascii()))) + + // FIXME + //if(szFile.isEmpty() || (!KviFileUtils::fileExists(szFile.toAscii()))) + if(szFile.isEmpty() || (!KviFileUtils::fileExists(szFile))) { c->warning(__tr2qs("File not found or empty")); return false; } QFile tmp(szFile); - if(!tmp.open(IO_ReadOnly)) { + if(!tmp.open(QIODevice::ReadOnly)) { c->warning(__tr2qs("I can't open that file")); return false; } diff --git a/src/modules/spaste/spaste_QT4_vc05.vcproj b/src/modules/spaste/spaste_QT4_vc05.vcproj index 8c874b9d6..724003628 100644 --- a/src/modules/spaste/spaste_QT4_vc05.vcproj +++ b/src/modules/spaste/spaste_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
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)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SPASTE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SPASTE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp index 8e244eb02..f26157c62 100644 --- a/src/modules/str/libkvistr.cpp +++ b/src/modules/str/libkvistr.cpp @@ -183,11 +183,11 @@ static bool str_kvs_fnc_len(KviKvsModuleFunctionCall * c) @title: $str.lowcase @short: - Returns the given string with all characters turned to lower case + Returns the given string with all characters turned to toLower case @syntax: <string> $str.lowcase(<string_to_convert:string>) @description: - Returns the <string_to_convert> with all characters turned to lower case. + Returns the <string_to_convert> with all characters turned to toLower case. Warning: this function uses ISO-8859-1 locale to make the case translation. If you want to use a locale aware translation mapping then please use localelowcase. @@ -209,11 +209,11 @@ static bool str_kvs_fnc_lowcase(KviKvsModuleFunctionCall * c) @title: $str.upcase @short: - Returns the given string with all characters turned to upper case + Returns the given string with all characters turned to toUpper case @syntax: <string> $str.upcase(<string_to_convert:string>) @description: - Returns the given <string_to_convert> with all characters turned to lower case. + Returns the given <string_to_convert> with all characters turned to toLower case. Warning: this function uses ISO-8859-1 locale to make the case translation. If you want to use a locale aware translation mapping then please use $str.localeupcase. @@ -235,11 +235,11 @@ static bool str_kvs_fnc_upcase(KviKvsModuleFunctionCall * c) @title: $str.localelowcase @short: - Returns the given string with all characters turned to lower case + Returns the given string with all characters turned to toLower case @syntax: <string> $str.localelowcase(<string_to_convert:string>) @description: - Returns the given <string_to_convert> with all characters turned to lower case. + Returns the given <string_to_convert> with all characters turned to toLower case. Warning: this function is locale aware and it may produce unexpected results in locales that contain strange exceptions (like Turkish which maps i to Y with an accent). For IRC interaction you might prefer using $str.lowcase @@ -251,7 +251,7 @@ static bool str_kvs_fnc_localelowcase(KviKvsModuleFunctionCall * c) KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("string_to_convert",KVS_PT_STRING,0,szString) KVSM_PARAMETERS_END(c) - c->returnValue()->setString(szString.lower()); + c->returnValue()->setString(szString.toLower()); return true; } @@ -262,11 +262,11 @@ static bool str_kvs_fnc_localelowcase(KviKvsModuleFunctionCall * c) @title: $str.localeupcase @short: - Returns the given string with all characters turned to upper case + Returns the given string with all characters turned to toUpper case @syntax: <string> $str.localeupcase(<string_to_convert:string>) @description: - Returns the given <string_to_convert> with all characters turned to lower case. + Returns the given <string_to_convert> with all characters turned to toLower case. Warning: this function is locale aware and it may produce unexpected results in locales that contain strange exceptions (like Turkish which maps i to Y with an accent). For IRC interaction you might prefer using $str.upcase @@ -278,7 +278,7 @@ static bool str_kvs_fnc_localeupcase(KviKvsModuleFunctionCall * c) KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("string_to_convert",KVS_PT_STRING,0,szString) KVSM_PARAMETERS_END(c) - c->returnValue()->setString(szString.upper()); + c->returnValue()->setString(szString.toUpper()); return true; } @@ -395,7 +395,7 @@ static bool str_kvs_fnc_contains(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("container",KVS_PT_STRING,0,szString) KVSM_PARAMETER("tofind",KVS_PT_STRING,0,szSubString) KVSM_PARAMETERS_END(c) - bIs = szString.find(szSubString) != -1; + bIs = szString.indexOf(szSubString,Qt::CaseInsensitive) != -1; c->returnValue()->setBoolean(bIs); return true; } @@ -425,7 +425,7 @@ static bool str_kvs_fnc_containsnocase(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("container",KVS_PT_STRING,0,szString) KVSM_PARAMETER("tofind",KVS_PT_STRING,0,szSubString) KVSM_PARAMETERS_END(c) - bIs = szString.find(szSubString,0,false) != -1; + bIs = szString.indexOf(szSubString,0,Qt::CaseInsensitive) != -1; c->returnValue()->setBoolean(bIs); return true; } @@ -601,7 +601,7 @@ static bool str_kvs_fnc_find(KviKvsModuleFunctionCall * c) while (cnt<=pos) { - idx = szFindIn.right(szFindIn.length() - totalIdx).find(szToFind); + idx = szFindIn.right(szFindIn.length() - totalIdx).indexOf(szToFind,Qt::CaseInsensitive); if(idx == -1) { c->returnValue()->setInteger(-1); @@ -638,7 +638,7 @@ static bool str_kvs_fnc_findfirst(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("findIn",KVS_PT_STRING,0,szString) KVSM_PARAMETER("toFind",KVS_PT_STRING,0,szString2) KVSM_PARAMETERS_END(c) - c->returnValue()->setInteger(szString.find(szString2)); + c->returnValue()->setInteger(szString.indexOf(szString2)); return true; } /* @@ -664,7 +664,7 @@ static bool str_kvs_fnc_findfirstnocase(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("findIn",KVS_PT_STRING,0,szString) KVSM_PARAMETER("toFind",KVS_PT_STRING,0,szString2) KVSM_PARAMETERS_END(c) - c->returnValue()->setInteger(szString.find(szString2,0,false)); + c->returnValue()->setInteger(szString.indexOf(szString2,0,Qt::CaseInsensitive)); return true; } /* @@ -690,7 +690,7 @@ static bool str_kvs_fnc_findlast(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("findIn",KVS_PT_STRING,0,szString) KVSM_PARAMETER("toFind",KVS_PT_STRING,0,szString2) KVSM_PARAMETERS_END(c) - c->returnValue()->setInteger(szString.findRev(szString2)); + c->returnValue()->setInteger(szString.lastIndexOf(szString2)); return true; } /* @@ -716,7 +716,7 @@ static bool str_kvs_fnc_findlastnocase(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("findIn",KVS_PT_STRING,0,szString) KVSM_PARAMETER("toFind",KVS_PT_STRING,0,szString2) KVSM_PARAMETERS_END(c) - c->returnValue()->setInteger(szString.findRev(szString2,-1,false)); + c->returnValue()->setInteger(szString.lastIndexOf(szString2,-1,Qt::CaseInsensitive)); return true; } /* @@ -899,7 +899,7 @@ static bool str_kvs_fnc_strip(KviKvsModuleFunctionCall * c) KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("string",KVS_PT_STRING,0,szString) KVSM_PARAMETERS_END(c) - c->returnValue()->setString(szString.stripWhiteSpace()); + c->returnValue()->setString(szString.trimmed()); return true; } /* @@ -1048,7 +1048,7 @@ static bool str_kvs_fnc_replacenocase(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("newstr",KVS_PT_STRING,0,szNewstr) KVSM_PARAMETER("toreplace",KVS_PT_STRING,0,szToreplace) KVSM_PARAMETERS_END(c) - szString.replace(szToreplace,szNewstr,false); + szString.replace(szToreplace,szNewstr,Qt::CaseInsensitive); c->returnValue()->setString(szString); return true; } @@ -1094,7 +1094,7 @@ static bool str_kvs_fnc_urlencode(KviKvsModuleFunctionCall * c) while(idx<sizeof(toReplace)) { - szNewString=szString.replace(toReplace[idx],newStr[idx],false); + szNewString=szString.replace(toReplace[idx],newStr[idx],Qt::CaseInsensitive); idx++; } @@ -1128,7 +1128,7 @@ static bool str_kvs_fnc_lefttofirst(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("string",KVS_PT_STRING,0,szString) KVSM_PARAMETER("substring",KVS_PT_STRING,0,szNewstr) KVSM_PARAMETERS_END(c) - where = szString.find(szNewstr,false); + where = szString.indexOf(szNewstr,Qt::CaseInsensitive); if(where != -1) c->returnValue()->setString(szString.left(where)); else c->returnValue()->setString(szString); return true; @@ -1158,7 +1158,7 @@ static bool str_kvs_fnc_lefttolast(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("string",KVS_PT_STRING,0,szString) KVSM_PARAMETER("substring",KVS_PT_STRING,0,szNewstr) KVSM_PARAMETERS_END(c) - int where = szString.findRev(szNewstr,-1,false); + int where = szString.lastIndexOf(szNewstr,-1,Qt::CaseInsensitive); if(where != -1) c->returnValue()->setString(szString.left(where)); else c->returnValue()->setString(szString); return true; @@ -1188,7 +1188,7 @@ static bool str_kvs_fnc_rightfromfirst(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("string",KVS_PT_STRING,0,szString) KVSM_PARAMETER("substring",KVS_PT_STRING,0,szNewstr) KVSM_PARAMETERS_END(c) - int idx = szString.find(szNewstr,false); + int idx = szString.indexOf(szNewstr,Qt::CaseInsensitive); if(idx != -1) c->returnValue()->setString(szString.right(szString.length()-(idx+szNewstr.length()))); else c->returnValue()->setString(""); return true; @@ -1219,7 +1219,7 @@ static bool str_kvs_fnc_rightfromlast(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("string",KVS_PT_STRING,0,szString) KVSM_PARAMETER("substring",KVS_PT_STRING,0,szNewstr) KVSM_PARAMETERS_END(c) - int idx = szString.findRev(szNewstr,-1,false); + int idx = szString.lastIndexOf(szNewstr,-1,Qt::CaseInsensitive); if(idx != -1) c->returnValue()->setString(szString.right(szString.length()-(idx+szNewstr.length()))); else c->returnValue()->setString(""); return true; @@ -1264,8 +1264,8 @@ static bool str_kvs_fnc_match(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("string",KVS_PT_STRING,0,szString) KVSM_PARAMETER("flags",KVS_PT_STRING,KVS_PF_OPTIONAL,szFlags) KVSM_PARAMETERS_END(c) - bool bRegExp = (szFlags.find(QChar('r')) != -1) || (szFlags.find(QChar('R')) != -1); - bool bExact = (szFlags.find(QChar('e')) != -1) || (szFlags.find(QChar('E')) != -1); + bool bRegExp = (szFlags.indexOf(QChar('r')) != -1) || (szFlags.indexOf(QChar('R')) != -1); + bool bExact = (szFlags.indexOf(QChar('e')) != -1) || (szFlags.indexOf(QChar('E')) != -1); c->returnValue()->setBoolean(KviQString::matchStringCS(szWildcard,szString,bRegExp,bExact)); return true; } @@ -1310,8 +1310,8 @@ static bool str_kvs_fnc_matchnocase(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("string",KVS_PT_STRING,0,szString) KVSM_PARAMETER("flags",KVS_PT_STRING,KVS_PF_OPTIONAL,szFlags) KVSM_PARAMETERS_END(c) - bool bRegExp = (szFlags.find(QChar('r')) != -1) || (szFlags.find(QChar('R')) != -1); - bool bExact = (szFlags.find(QChar('e')) != -1) || (szFlags.find(QChar('E')) != -1); + bool bRegExp = (szFlags.indexOf(QChar('r')) != -1) || (szFlags.indexOf(QChar('R')) != -1); + bool bExact = (szFlags.indexOf(QChar('e')) != -1) || (szFlags.indexOf(QChar('E')) != -1); c->returnValue()->setBoolean(KviQString::matchStringCI(szWildcard,szString,bRegExp,bExact)); return true; } @@ -1469,7 +1469,7 @@ static bool str_kvs_fnc_token(KviKvsModuleFunctionCall * c) Returns the sum of the character codes of the parameter <string>. The sum is suitable for implementing a simple hashing algorithm.[br] If <bCaseInsensitive> is specified and $true then the string - will be converted to lowercase first. + will be converted to toLowercase first. */ @@ -1488,7 +1488,7 @@ static bool str_kvs_fnc_charsum(KviKvsModuleFunctionCall * c) { while(idx < len) { - sum += szString[idx].lower().unicode(); + sum += szString[idx].toLower().unicode(); idx++; } } else { @@ -1599,7 +1599,7 @@ static bool str_kvs_fnc_join(KviKvsModuleFunctionCall * c) KVSM_PARAMETERS_END(c) QString szRet; - bool bSkipEmpty = szFlags.find('n',0,false) != -1; + bool bSkipEmpty = szFlags.indexOf('n',0,Qt::CaseInsensitive) != -1; bool bFirst = true; @@ -1692,16 +1692,16 @@ static bool str_kvs_fnc_grep(KviKvsModuleFunctionCall * c) KviKvsArray * a = ac.array(); - bool bCaseSensitive = szFlags.find('s',0,false) != -1; - bool bRegexp = szFlags.find('r',0,false) != -1; - bool bWild = szFlags.find('w',0,false) != -1; + bool bCaseSensitive = szFlags.indexOf('s',0,Qt::CaseInsensitive) != -1; + bool bRegexp = szFlags.indexOf('r',0,Qt::CaseInsensitive) != -1; + bool bWild = szFlags.indexOf('w',0,Qt::CaseInsensitive) != -1; int idx = 0; int cnt = a->size(); int i = 0; if(bRegexp || bWild) { - QRegExp re(szMatch,bCaseSensitive,bWild); + QRegExp re(szMatch,bCaseSensitive?Qt::CaseSensitive:Qt::CaseInsensitive,bRegexp?QRegExp::RegExp:QRegExp::Wildcard); while(idx < cnt) { KviKvsVariant * v = a->at(idx); @@ -1709,7 +1709,7 @@ static bool str_kvs_fnc_grep(KviKvsModuleFunctionCall * c) { QString sz; v->asString(sz); - if(re.search(sz) != -1) + if(re.indexIn(sz) != -1) { n->set(i,new KviKvsVariant(sz)); i++; @@ -1725,7 +1725,7 @@ static bool str_kvs_fnc_grep(KviKvsModuleFunctionCall * c) { QString sz; v->asString(sz); - if(sz.find(szMatch,0,bCaseSensitive) != -1) + if(sz.indexOf(szMatch,0,bCaseSensitive?Qt::CaseSensitive:Qt::CaseInsensitive) != -1) { n->set(i,new KviKvsVariant(sz)); i++; @@ -1811,10 +1811,10 @@ static bool str_kvs_fnc_split(KviKvsModuleFunctionCall * c) if(iMaxItems == 0)return true; - bool bWild = szFla.find('w',0,false) != -1; - bool bContainsR = szFla.find('r',0,false) != -1; - bool bCaseSensitive = szFla.find('s',0,false) != -1; - bool bNoEmpty = szFla.find('n',0,false) != -1; + bool bWild = szFla.indexOf('w',0,Qt::CaseInsensitive) != -1; + bool bContainsR = szFla.indexOf('r',0,Qt::CaseInsensitive) != -1; + bool bCaseSensitive = szFla.indexOf('s',0,Qt::CaseInsensitive) != -1; + bool bNoEmpty = szFla.indexOf('n',0,Qt::CaseInsensitive) != -1; int id = 0; @@ -1824,11 +1824,11 @@ static bool str_kvs_fnc_split(KviKvsModuleFunctionCall * c) if(bContainsR || bWild) { - QRegExp re(szSep,bCaseSensitive,bWild); + QRegExp re(szSep,bCaseSensitive?Qt::CaseSensitive:Qt::CaseInsensitive,bWild?QRegExp::Wildcard:QRegExp::RegExp); while((iMatch != -1) && (iMatch < iStrLen) && ((id < (iMaxItems-1)) || (iMaxItems < 0))) { - iMatch = re.search(szStr,iBegin); + iMatch = re.indexIn(szStr,iBegin); if(iMatch != -1) { int len = re.matchedLength(); @@ -1854,7 +1854,7 @@ static bool str_kvs_fnc_split(KviKvsModuleFunctionCall * c) } else { while((iMatch != -1) && (iMatch < iStrLen) && ((id < (iMaxItems-1)) || (iMaxItems < 0))) { - iMatch = szStr.find(szSep,iBegin,bCaseSensitive); + iMatch = szStr.indexOf(szSep,iBegin,bCaseSensitive?Qt::CaseSensitive:Qt::CaseInsensitive); if(iMatch != -1) { QString tmp = szStr.mid(iBegin,iMatch - iBegin); @@ -1920,7 +1920,7 @@ static bool str_kvs_fnc_split(KviKvsModuleFunctionCall * c) [tr][td][b]?x[/b][/td][td]The next parameter is evaluated as an unsigned integer and its hexadecimal rappresentation is substituted in place of ?x[/td][/tr] [tr][td][b]?h[/b][/td][td]Same as ?x[/td][/tr] - [tr][td][b]?X[/b][/td][td]Same as ?x but uppercase hexadecimal digits are used[/td][/tr] + [tr][td][b]?X[/b][/td][td]Same as ?x but toUppercase hexadecimal digits are used[/td][/tr] [tr][td][b]?H[/b][/td][td]Same as ?X[/td][/tr] [tr][td][b]??[/b][/td][td]A literal question mark[/td][/tr] [tr][td][b]?[.N]f[/b][/td][td]The next parameter is evaluated as a real floating point value @@ -1929,7 +1929,7 @@ static bool str_kvs_fnc_split(KviKvsModuleFunctionCall * c) [tr][td][b]?[.N]e[/b][/td][td]The next parameter is evaluated as a real floating point value and its scientific rappresentation substituted in place of ?e. The optional [.N] modifier, where N is an unsigned integer, rappresents the desired precision.[/td][/tr] - [tr][td][b]?[.N]E[/b][/td][td]Same as ?e but an uppercase E is used as the exponent prefix[/td][/tr] + [tr][td][b]?[.N]E[/b][/td][td]Same as ?e but an toUppercase E is used as the exponent prefix[/td][/tr] [/table] @examples: [example] diff --git a/src/modules/str/str_QT4_vc05.vcproj b/src/modules/str/str_QT4_vc05.vcproj index 42c3c527b..4dc879707 100644 --- a/src/modules/str/str_QT4_vc05.vcproj +++ b/src/modules/str/str_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
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)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;STR_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;STR_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index 6b328059b..00d4179ee 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -202,14 +202,15 @@ static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall *c) KVSM_PARAMETERS_END(c) KviQCString szVar = szVariable.toLocal8Bit(); -#ifdef COMPILE_ON_WINDOWS - QString env = getenv(szVar.data()); - QString def = __tr2qs("No environment variable found, please don't use the %% in the request"); +/*#ifdef COMPILE_ON_WINDOWS + QString env= getenv(szVar.data()); + QString def= __tr2qs("No environment variable found, please don't use the %% in the request"); c->returnValue()->setString(env.isEmpty() ? QString::fromLocal8Bit(env) : QString::fromLocal8Bit(def)); #else +*/ char * b = kvi_getenv(szVar.data()); c->returnValue()->setString(b ? QString::fromLocal8Bit(b) : QString::null); -#endif +//#endif return true; } diff --git a/src/modules/system/system_QT4_vc05.vcproj b/src/modules/system/system_QT4_vc05.vcproj index 43c173419..4e213a9e4 100644 --- a/src/modules/system/system_QT4_vc05.vcproj +++ b/src/modules/system/system_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
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)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SYSTEM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SYSTEM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
diff --git a/src/modules/texticons/texticon_QT4_vc05.vcproj b/src/modules/texticons/texticon_QT4_vc05.vcproj index 96609d668..a52e5e1b9 100644 --- a/src/modules/texticons/texticon_QT4_vc05.vcproj +++ b/src/modules/texticons/texticon_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
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)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SYSTEM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SYSTEM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp index ef1d7d4fe..bf6bc1868 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -138,7 +138,7 @@ KviTipWindow::KviTipWindow() setFixedSize(KVI_TIP_WINDOW_WIDTH,KVI_TIP_WINDOW_HEIGHT);
- setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IDEA)));
+ setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IDEA)));
setWindowTitle(__tr2qs("Did you know..."));
diff --git a/src/modules/tip/tip_QT4_vc05.vcproj b/src/modules/tip/tip_QT4_vc05.vcproj index c63d58ede..9d19dd0ce 100644 --- a/src/modules/tip/tip_QT4_vc05.vcproj +++ b/src/modules/tip/tip_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
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)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
diff --git a/src/modules/tmphighlight/tmphighlight_QT4_vc05.vcproj b/src/modules/tmphighlight/tmphighlight_QT4_vc05.vcproj index bd974d6e9..560a76764 100644 --- a/src/modules/tmphighlight/tmphighlight_QT4_vc05.vcproj +++ b/src/modules/tmphighlight/tmphighlight_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
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;_DEBUG;_WINDOWS;_USRDLL;TMPHIGHLIGHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TMPHIGHLIGHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
diff --git a/src/modules/toolbar/toolbar_QT4_vc05.vcproj b/src/modules/toolbar/toolbar_QT4_vc05.vcproj index 3dc006b06..3d4e13974 100644 --- a/src/modules/toolbar/toolbar_QT4_vc05.vcproj +++ b/src/modules/toolbar/toolbar_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TOOLBAR_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TOOLBAR_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
diff --git a/src/modules/toolbareditor/toolbareditor_QT4_vc05.vcproj b/src/modules/toolbareditor/toolbareditor_QT4_vc05.vcproj index 37575b394..970b628d8 100644 --- a/src/modules/toolbareditor/toolbareditor_QT4_vc05.vcproj +++ b/src/modules/toolbareditor/toolbareditor_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
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";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TOOLBAREDITOR_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TOOLBAREDITOR_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index 8f796139c..d48910271 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -868,7 +868,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) pArray->set(id, new KviKvsVariant(QString(wnd->id()))); id++; } else { - if(szType.lower()==wnd->typeString()) + if(szType.toLower()==wnd->typeString()) { pArray->set(id, new KviKvsVariant(QString(wnd->id()))); id++; @@ -880,7 +880,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) } else if(KviQString::equalCI(szContext,"any")) { // all contexts and also "no_context" windows - bool bAllWindows = KviQString::equalCI(szType.lower(),"all"); + bool bAllWindows = KviQString::equalCI(szType.toLower(),"all"); KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) @@ -890,7 +890,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) pArray->set(id, new KviKvsVariant(QString(wnd->id()))); id++; } else { - if(szType.lower()==wnd->typeString()) + if(szType.toLower()==wnd->typeString()) { pArray->set(id, new KviKvsVariant(QString(wnd->id()))); id++; @@ -901,7 +901,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) } else if(KviQString::equalCI(szContext,"none")) { // only "no_context" windows - bool bAllWindows = KviQString::equalCI(szType.lower(),"all"); + bool bAllWindows = KviQString::equalCI(szType.toLower(),"all"); KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) @@ -913,7 +913,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) pArray->set(id, new KviKvsVariant(QString(wnd->id()))); id++; } else { - if(szType.lower()==wnd->typeString()) + if(szType.toLower()==wnd->typeString()) { pArray->set(id, new KviKvsVariant(QString(wnd->id()))); id++; @@ -946,7 +946,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) uId = c->window()->console()->ircContextId(); } - bool bAllWindows = KviQString::equalCI(szType.lower(),"all"); + bool bAllWindows = KviQString::equalCI(szType.toLower(),"all"); KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) @@ -960,7 +960,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) pArray->set(id, new KviKvsVariant(QString(wnd->id()))); id++; } else { - if(szType.lower()==wnd->typeString()) + if(szType.toLower()==wnd->typeString()) { pArray->set(id, new KviKvsVariant(QString(wnd->id()))); id++; diff --git a/src/modules/window/window_QT4_vc05.vcproj b/src/modules/window/window_QT4_vc05.vcproj index 601553c56..231f71797 100644 --- a/src/modules/window/window_QT4_vc05.vcproj +++ b/src/modules/window/window_QT4_vc05.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool"
Optimization="0"
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)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINDOW_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINDOW_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
|