diff options
| author |  Noldor | 2008-05-19 18:20:39 +0000 |
|---|---|---|
| committer | Noldor | 2008-05-19 18:20:39 +0000 |
| commit | a76cf3043d7ce4eb169f9afadde25b5c1d36ea10 (patch) | |
| tree | 62399c7bb997462f95e32c3e25c6533d6aa4c166 /src/modules | |
| parent | compilation fix (diff) | |
| download | KVIrc-a76cf3043d7ce4eb169f9afadde25b5c1d36ea10.tar.gz KVIrc-a76cf3043d7ce4eb169f9afadde25b5c1d36ea10.tar.bz2 KVIrc-a76cf3043d7ce4eb169f9afadde25b5c1d36ea10.zip | |
more QT4 port
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1822 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/file/file_QT4_vc05.vcproj | 2 | ||||
| -rw-r--r-- | src/modules/file/libkvifile.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/file/file_QT4_vc05.vcproj b/src/modules/file/file_QT4_vc05.vcproj index 1e1b78dea..60c45b4b6 100644 --- a/src/modules/file/file_QT4_vc05.vcproj +++ b/src/modules/file/file_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;FILE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FILE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp index 9169d8d02..c207e199f 100644 --- a/src/modules/file/libkvifile.cpp +++ b/src/modules/file/libkvifile.cpp @@ -35,6 +35,7 @@ #include <QFileInfo> #include <QDir> #include <QTextStream> +#include <QTextCodec> /* @doc: file.copy @@ -827,7 +828,7 @@ static bool file_kvs_fnc_readLines(KviKvsModuleFunctionCall * c) QTextStream stream( &f ); - stream.setEncoding(bLocal8Bit ? QTextStream::Locale : QTextStream::UnicodeUTF8); + if (!bLocal8Bit) stream.setCodec(QTextCodec::codecForMib(106)); for(int i=0;i<iStartLine;i++) stream.readLine(); |