diff -r 608f976aa7bb -r 6a0342b3c519 main.cpp --- a/main.cpp Tue Jun 06 14:58:11 2006 +0000 +++ b/main.cpp Tue Jun 13 08:49:12 2006 +0000 @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -8,7 +8,7 @@ #include //Added by qt3to4: #include -#include +#include #include "settings.h" #include "options.h" @@ -79,16 +79,16 @@ QAction *actionFormatLinkColorHint; QAction *actionFormatLinkColor; -Q3ActionGroup *actionGroupModModes; +QActionGroup *actionGroupModModes; QAction *actionModModeColor; QAction *actionModModeLink; QAction *actionModModeCopy; -Q3ActionGroup *actionGroupFormatFrameTypes; +QActionGroup *actionGroupFormatFrameTypes; QAction *actionFormatFrameNone; QAction *actionFormatFrameRectangle; -Q3ActionGroup *actionGroupFormatLinkStyles; +QActionGroup *actionGroupFormatLinkStyles; QAction *actionFormatIncludeImagesVer; QAction *actionFormatIncludeImagesHor; QAction *actionFormatHideLinkUnselected; @@ -122,7 +122,7 @@ Q3PopupMenu *exportImageFormatMenu; -Settings settings; +Settings settings ("vym","vym"); // Organization, Application name Options options; int statusbarTime=3500;