1.1 --- a/main.cpp Tue Jun 06 14:58:11 2006 +0000
1.2 +++ b/main.cpp Tue Jun 13 08:49:12 2006 +0000
1.3 @@ -1,4 +1,4 @@
1.4 -#include <qapplication.h>
1.5 +#include <QApplication>
1.6 #include <qpixmap.h>
1.7 #include <qtranslator.h>
1.8 #include <qdir.h>
1.9 @@ -8,7 +8,7 @@
1.10 #include <qmime.h>
1.11 //Added by qt3to4:
1.12 #include <Q3PopupMenu>
1.13 -#include <Q3ActionGroup>
1.14 +#include <QActionGroup>
1.15
1.16 #include "settings.h"
1.17 #include "options.h"
1.18 @@ -79,16 +79,16 @@
1.19 QAction *actionFormatLinkColorHint;
1.20 QAction *actionFormatLinkColor;
1.21
1.22 -Q3ActionGroup *actionGroupModModes;
1.23 +QActionGroup *actionGroupModModes;
1.24 QAction *actionModModeColor;
1.25 QAction *actionModModeLink;
1.26 QAction *actionModModeCopy;
1.27
1.28 -Q3ActionGroup *actionGroupFormatFrameTypes;
1.29 +QActionGroup *actionGroupFormatFrameTypes;
1.30 QAction *actionFormatFrameNone;
1.31 QAction *actionFormatFrameRectangle;
1.32
1.33 -Q3ActionGroup *actionGroupFormatLinkStyles;
1.34 +QActionGroup *actionGroupFormatLinkStyles;
1.35 QAction *actionFormatIncludeImagesVer;
1.36 QAction *actionFormatIncludeImagesHor;
1.37 QAction *actionFormatHideLinkUnselected;
1.38 @@ -122,7 +122,7 @@
1.39 Q3PopupMenu *exportImageFormatMenu;
1.40
1.41
1.42 -Settings settings;
1.43 +Settings settings ("vym","vym"); // Organization, Application name
1.44 Options options;
1.45
1.46 int statusbarTime=3500;