Warning--

Fix qdatastream versioning
Fix compile

svn path=/branches/work/kde4/kdegraphics/kdvi/; revision=436378
This commit is contained in:
Laurent Montel 2005-07-19 16:18:20 +00:00
parent 21dac3d767
commit 8ae2192055
3 changed files with 8 additions and 4 deletions

View file

@ -26,7 +26,7 @@
//Added by qt3to4:
#include <QHBoxLayout>
#include <QMouseEvent>
#include <qptrstack.h>
#include <q3ptrstack.h>
#include <kapplication.h>
#include <kmessagebox.h>
@ -545,9 +545,9 @@ bool dviRenderer::setFile(const QString &fname)
// Generate the list of bookmarks
bookmarks.clear();
QPtrStack<Bookmark> stack;
Q3PtrStack<Bookmark> stack;
stack.setAutoDelete (false);
QValueVector<PreBookmark>::iterator it;
Q3ValueVector<PreBookmark>::iterator it;
for( it = prebookmarks.begin(); it != prebookmarks.end(); ++it ) {
Bookmark *bmk = new Bookmark((*it).title, findAnchor((*it).anchorName));
if (stack.isEmpty())

View file

@ -466,7 +466,7 @@ void dviRenderer::prescan_ParseSourceSpecial(QString cp)
// "src:123file.tex" to positions in the DVI file
// extract the file name and the numeral part from the string
Q_UINT32 j;
Q_INT32 j;
for(j=0;j<cp.length();j++)
if (!cp.at(j).isNumber())
break;

View file

@ -101,6 +101,8 @@ int main(int argc, char** argv)
QByteArray data, replyData;
Q3CString replyType;
QDataStream arg(&data, QIODevice::WriteOnly);
arg.setVersion(QDataStream::Qt_3_1);
bool result;
arg << qualPath.stripWhiteSpace();
if (!app.dcopClient()->call( *it, "kmultipage", "is_file_loaded(QString)", data, replyType, replyData))
@ -108,6 +110,8 @@ int main(int argc, char** argv)
else
{
QDataStream reply(&replyData, QIODevice::ReadOnly);
reply.setVersion(QDataStream::Qt_3_1);
if (replyType == "bool")
{
reply >> result;