# HG changeset patch # User insilmaril # Date 1155643274 0 # Node ID 699f285290795a0e11ec36803d2431f4d9c7338c # Parent f4c37956d28d5108e7defc2cef8da59859b6b378 removed unneeded toolbars.* diff -r f4c37956d28d -r 699f28529079 aboutdialog.cpp --- a/aboutdialog.cpp Tue Aug 15 11:43:21 2006 +0000 +++ b/aboutdialog.cpp Tue Aug 15 12:01:14 2006 +0000 @@ -190,6 +190,6 @@ void AboutTextBrowser::setSource(const QUrl &url ) { QProcess *proc= new QProcess (); - proc->start( settings.value("/vym/mainwindow/readerURL"),QStringList ()<start( settings.value("/vym/mainwindow/readerURL").toString(),QStringList ()<waitForStarted() &&mainWindow->settingsURL() ) setSource(url); } diff -r f4c37956d28d -r 699f28529079 mainwindow.cpp --- a/mainwindow.cpp Tue Aug 15 11:43:21 2006 +0000 +++ b/mainwindow.cpp Tue Aug 15 12:01:14 2006 +0000 @@ -1109,7 +1109,6 @@ standardFlagsDefault->setVisibility (false); standardFlagsDefault->setName ("standardFlagsDef"); standardFlagsDefault->setToolBar (tb); - TB_standardFlags=tb; tb->setObjectName ("standardFlagTB"); fo->load(QPixmap(flagsPath+"flag-exclamationmark.png")); @@ -3055,10 +3054,7 @@ void Main::testFunction() { - cout <isMovable()<pos()<move(QPoint (0,66)); - //currentMapEditor()->testFunction(); + currentMapEditor()->testFunction(); } void Main::helpDoc() diff -r f4c37956d28d -r 699f28529079 mainwindow.h --- a/mainwindow.h Tue Aug 15 11:43:21 2006 +0000 +++ b/mainwindow.h Tue Aug 15 12:01:14 2006 +0000 @@ -21,7 +21,6 @@ #include "findwindow.h" #include "mapeditor.h" #include "texteditor.h" -#include "toolbars.h" #include "xml.h" class Main : public QMainWindow @@ -185,8 +184,6 @@ void helpAboutQT(); private: - ToolBarSet toolbars; - QToolBar *TB_standardFlags; QTabWidget *tabWidget; FindWindow *findWindow; QStringList lastMaps;