aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects/class_multilineedit.cpp
diff options
context:
space:
mode:
authorGravatar Noldor2008-08-04 16:14:40 +0000
committerGravatar Noldor2008-08-04 16:14:40 +0000
commitbb4fcd90315ef77460676935005cdbbde1e55f76 (patch)
tree74d3fda8fc99ff3beb2f1c679bde03dc1a7bb145 /src/modules/objects/class_multilineedit.cpp
parentcompilation fix (diff)
downloadKVIrc-bb4fcd90315ef77460676935005cdbbde1e55f76.tar.gz
KVIrc-bb4fcd90315ef77460676935005cdbbde1e55f76.tar.bz2
KVIrc-bb4fcd90315ef77460676935005cdbbde1e55f76.zip
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
Diffstat (limited to 'src/modules/objects/class_multilineedit.cpp')
-rw-r--r--src/modules/objects/class_multilineedit.cpp4
1 files changed, 2 insertions, 2 deletions
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 );