1.1 --- a/mapeditor.cpp Tue Jul 04 12:10:56 2006 +0000
1.2 +++ b/mapeditor.cpp Thu Jul 06 15:39:54 2006 +0000
1.3 @@ -1,24 +1,23 @@
1.4 #include "mapeditor.h"
1.5
1.6 #include <qstatusbar.h>
1.7 -#include <qmessagebox.h>
1.8 +#include <QMessageBox>
1.9 #include <qapplication.h>
1.10 #include <qpainter.h>
1.11 #include <q3popupmenu.h>
1.12 #include <qprinter.h>
1.13 #include <q3paintdevicemetrics.h>
1.14 -#include <qfile.h>
1.15 +#include <QFile>
1.16 #include <q3filedialog.h>
1.17 -#include <qdir.h>
1.18 -#include <qcolor.h>
1.19 -#include <qcolordialog.h>
1.20 -#include <qbitmap.h>
1.21 -#include <q3process.h>
1.22 +#include <QDir>
1.23 +#include <QColor>
1.24 +#include <QColorDialog>
1.25 +#include <QBitmap>
1.26 #include <qinputdialog.h>
1.27 #include <q3dragobject.h>
1.28 #include <q3urloperator.h>
1.29 #include <q3networkprotocol.h>
1.30 -#include <qregexp.h>
1.31 +#include <QRegExp>
1.32 //Added by qt3to4:
1.33 #include <QResizeEvent>
1.34 #include <QContextMenuEvent>
1.35 @@ -2234,6 +2233,9 @@
1.36
1.37 BranchObj* MapEditor::findText (QString s, bool cs)
1.38 {
1.39 + QTextDocument::FindFlags flags=0;
1.40 + if (cs) flags=QTextDocument::QTextDocument::FindCaseSensitively;
1.41 +
1.42 if (!itFind)
1.43 { // Nothing found or new find process
1.44 if (EOFind)
1.45 @@ -2258,7 +2260,7 @@
1.46 adjustCanvasSize();
1.47 ensureSelectionVisible();
1.48 }
1.49 - if (textEditor->findText(s,cs))
1.50 + if (textEditor->findText(s,flags))
1.51 {
1.52 searching=false;
1.53 foundNote=true;
1.54 @@ -3111,10 +3113,10 @@
1.55 return;
1.56
1.57 QString ub=vymBaseDir.path()+"/scripts/update-bookmarks";
1.58 - Q3Process *proc = new Q3Process( this );
1.59 - proc->addArgument(ub);
1.60 -
1.61 - if ( !proc->start() )
1.62 +
1.63 + QProcess *proc= new QProcess (this);
1.64 + proc->start( ub);
1.65 + if (!proc->waitForStarted());
1.66 {
1.67 QMessageBox::warning(0,
1.68 tr("Warning"),
1.69 @@ -3122,7 +3124,7 @@
1.70 }
1.71
1.72
1.73 -/*
1.74 +/* Hide hidden stuff temporary, maybe add this as regular function somewhere
1.75 if (hidemode==HideNone)
1.76 {
1.77 setHideTmpMode (HideExport);