diff --git a/src/browsedialog.cpp b/src/browsedialog.cpp index 9b7c68c..d25e24e 100644 --- a/src/browsedialog.cpp +++ b/src/browsedialog.cpp @@ -1,11 +1,11 @@ -#include - #include "browsedialog.h" #include "FastDelegate.h" #include "filelister.h" #include "gmenu2x.h" +#include + using namespace fastdelegate; BrowseDialog::BrowseDialog(GMenu2X *gmenu2x, const string &title, diff --git a/src/browsedialog.h b/src/browsedialog.h index 74209ac..53df548 100644 --- a/src/browsedialog.h +++ b/src/browsedialog.h @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -18,26 +18,24 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef BROWSEDIALOG_H_ -#define BROWSEDIALOG_H_ +#ifndef BROWSEDIALOG_H +#define BROWSEDIALOG_H -#include -#include "filelister.h" -#include "gmenu2x.h" #include "buttonbox.h" #include "dialog.h" +#include "filelister.h" #include "inputmanager.h" -class FileLister; - -using std::string; +#include +#include class BrowseDialog : protected Dialog { protected: - BrowseDialog(GMenu2X *gmenu2x, const string &title, const string &subtitle); + BrowseDialog(GMenu2X *gmenu2x, const std::string &title, + const std::string &subtitle); virtual ~BrowseDialog(); - void setPath(const string &path) { + void setPath(const std::string &path) { fl->setPath(path); } @@ -59,8 +57,8 @@ private: bool close, result; - string title; - string subtitle; + std::string title; + std::string subtitle; SDL_Rect clipRect; SDL_Rect touchRect; @@ -89,14 +87,12 @@ private: public: bool exec(); - const std::string &getPath() - { + const std::string &getPath() { return fl->getPath(); } - std::string getFile() - { + std::string getFile() { return (*fl)[selected]; } }; -#endif /*INPUTDIALOG_H_*/ +#endif // INPUTDIALOG_H diff --git a/src/dirdialog.cpp b/src/dirdialog.cpp index c5810be..f5121a6 100644 --- a/src/dirdialog.cpp +++ b/src/dirdialog.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -20,10 +20,12 @@ #include "dirdialog.h" +#include "filelister.h" + using namespace std; -DirDialog::DirDialog(GMenu2X *gmenu2x, const string &text, const string &dir) : - BrowseDialog(gmenu2x, "Directory Browser", text) +DirDialog::DirDialog(GMenu2X *gmenu2x, const string &text, const string &dir) + : BrowseDialog(gmenu2x, "Directory Browser", text) { fl = new FileLister(dir, true, false); } diff --git a/src/dirdialog.h b/src/dirdialog.h index 3f5381f..79c4685 100644 --- a/src/dirdialog.h +++ b/src/dirdialog.h @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -18,19 +18,18 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef DIRDIALOG_H_ -#define DIRDIALOG_H_ - -#include -#include "gmenu2x.h" +#ifndef DIRDIALOG_H +#define DIRDIALOG_H #include "browsedialog.h" +#include class DirDialog : public BrowseDialog { public: - DirDialog(GMenu2X *gmenu2x, const string &text, const string &dir=""); + DirDialog(GMenu2X *gmenu2x, const std::string &text, + const std::string &dir=""); ~DirDialog(); }; -#endif /*INPUTDIALOG_H_*/ +#endif // DIRDIALOG_H diff --git a/src/filedialog.cpp b/src/filedialog.cpp index 28dc79c..ec52498 100644 --- a/src/filedialog.cpp +++ b/src/filedialog.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -19,6 +19,8 @@ ***************************************************************************/ #include "filedialog.h" + +#include "filelister.h" #include "gmenu2x.h" using namespace std; diff --git a/src/imagedialog.cpp b/src/imagedialog.cpp index 5c6a71e..bfe24de 100644 --- a/src/imagedialog.cpp +++ b/src/imagedialog.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -18,6 +18,11 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include "imagedialog.h" + +#include "filelister.h" +#include "gmenu2x.h" + #include #include @@ -26,9 +31,6 @@ #include #include -#include "imagedialog.h" -#include "filelister.h" - using namespace std; ImageDialog::ImageDialog(GMenu2X *gmenu2x, const string &text, diff --git a/src/imagedialog.h b/src/imagedialog.h index fee70df..ce900ec 100644 --- a/src/imagedialog.h +++ b/src/imagedialog.h @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -18,24 +18,24 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef IMAGEDIALOG_H_ -#define IMAGEDIALOG_H_ +#ifndef IMAGEDIALOG_H +#define IMAGEDIALOG_H + +#include "filedialog.h" +#include "surfacecollection.h" #include -#include "filedialog.h" - -using std::string; -using std::vector; class ImageDialog : public FileDialog { protected: SurfaceCollection previews; public: - ImageDialog(GMenu2X *gmenu2x, const string &text, const string &filter="", const string &file=""); + ImageDialog(GMenu2X *gmenu2x, const std::string &text, + const std::string &filter="", const string &file=""); virtual ~ImageDialog(); virtual void beforeFileList(); virtual void onChangeDir(); }; -#endif /*IMAGEDIALOG_H_*/ +#endif // IMAGEDIALOG_H diff --git a/src/link.cpp b/src/link.cpp index 309fc3b..7fea615 100644 --- a/src/link.cpp +++ b/src/link.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -17,12 +17,16 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include -#include + #include "link.h" + +#include "gmenu2x.h" #include "menu.h" #include "selector.h" +#include +#include + using namespace std; using namespace fastdelegate; diff --git a/src/link.h b/src/link.h index 7bebfcb..e849b32 100644 --- a/src/link.h +++ b/src/link.h @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -17,14 +17,16 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifndef LINK_H #define LINK_H +#include "button.h" + #include #include -#include "button.h" -#include "surface.h" +class Surface; using std::string; diff --git a/src/linkapp.cpp b/src/linkapp.cpp index d07ae36..0992db5 100644 --- a/src/linkapp.cpp +++ b/src/linkapp.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -17,6 +17,15 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + +#include "linkapp.h" + +#include "debug.h" +#include "gmenu2x.h" +#include "menu.h" +#include "selector.h" +#include "textmanualdialog.h" + #include #include #include @@ -26,12 +35,6 @@ #include #include -#include "linkapp.h" -#include "menu.h" -#include "selector.h" -#include "textmanualdialog.h" -#include "debug.h" - using namespace std; LinkApp::LinkApp(GMenu2X *gmenu2x_, InputManager &inputMgr_, diff --git a/src/linkapp.h b/src/linkapp.h index b6c845b..780b17c 100644 --- a/src/linkapp.h +++ b/src/linkapp.h @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -17,14 +17,15 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifndef LINKAPP_H #define LINKAPP_H +#include "link.h" + #include #include -#include "link.h" - using std::string; class GMenu2X; diff --git a/src/menusettingdir.cpp b/src/menusettingdir.cpp index 457a101..f5427d1 100644 --- a/src/menusettingdir.cpp +++ b/src/menusettingdir.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -17,9 +17,12 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #include "menusettingdir.h" -#include "iconbutton.h" + #include "dirdialog.h" +#include "gmenu2x.h" +#include "iconbutton.h" using std::string; using fastdelegate::MakeDelegate; @@ -31,11 +34,13 @@ MenuSettingDir::MenuSettingDir( { IconButton *btn; - btn = new IconButton(gmenu2x, "skin:imgs/buttons/cancel.png", gmenu2x->tr["Clear"]); + btn = new IconButton(gmenu2x, "skin:imgs/buttons/cancel.png", + gmenu2x->tr["Clear"]); btn->setAction(MakeDelegate(this, &MenuSettingDir::clear)); buttonBox.add(btn); - btn = new IconButton(gmenu2x, "skin:imgs/buttons/accept.png", gmenu2x->tr["Select a directory"]); + btn = new IconButton(gmenu2x, "skin:imgs/buttons/accept.png", + gmenu2x->tr["Select a directory"]); btn->setAction(MakeDelegate(this, &MenuSettingDir::edit)); buttonBox.add(btn); } @@ -43,5 +48,5 @@ MenuSettingDir::MenuSettingDir( void MenuSettingDir::edit() { DirDialog dd(gmenu2x, description, value()); - if (dd.exec()) setValue( dd.getPath() ); + if (dd.exec()) setValue(dd.getPath()); } diff --git a/src/menusettingfile.cpp b/src/menusettingfile.cpp index 7aa43ff..f273225 100644 --- a/src/menusettingfile.cpp +++ b/src/menusettingfile.cpp @@ -17,9 +17,12 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #include "menusettingfile.h" -#include "iconbutton.h" + #include "filedialog.h" +#include "gmenu2x.h" +#include "iconbutton.h" using std::string; using fastdelegate::MakeDelegate; diff --git a/src/menusettingimage.cpp b/src/menusettingimage.cpp index d6738f1..7c870e4 100644 --- a/src/menusettingimage.cpp +++ b/src/menusettingimage.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -17,7 +17,10 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #include "menusettingimage.h" + +#include "gmenu2x.h" #include "imagedialog.h" #include "utilities.h" diff --git a/src/selector.cpp b/src/selector.cpp index fb04380..92e1d33 100644 --- a/src/selector.cpp +++ b/src/selector.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -36,6 +36,8 @@ using namespace std; +#define SELECTOR_ELEMENTS 11 + Selector::Selector(GMenu2X *gmenu2x, LinkApp *link, const string &selectorDir) : Dialog(gmenu2x) { diff --git a/src/selector.h b/src/selector.h index 2bece64..14cba96 100644 --- a/src/selector.h +++ b/src/selector.h @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -18,15 +18,13 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef SELECTOR_H_ -#define SELECTOR_H_ +#ifndef SELECTOR_H +#define SELECTOR_H -#include -#include "gmenu2x.h" -#include "utilities.h" #include "dialog.h" -#define SELECTOR_ELEMENTS 11 +#include +#include class LinkApp; class FileLister; @@ -38,21 +36,23 @@ class Selector : protected Dialog { private: int selRow; LinkApp *link; - string file, dir; - unordered_map aliases; + std::string file, dir; + std::tr1::unordered_map aliases; void loadAliases(); - string getAlias(const string &key); - void prepare(FileLister *fl, vector *screens, vector *titles); - void freeScreenshots(vector *screens); + string getAlias(const std::string &key); + void prepare(FileLister *fl, std::vector *screens, + std::vector *titles); + void freeScreenshots(std::vector *screens); public: - Selector(GMenu2X *gmenu2x, LinkApp *link, const string &selectorDir=""); + Selector(GMenu2X *gmenu2x, LinkApp *link, + const std::string &selectorDir = ""); - int exec(int startSelection=0); + int exec(int startSelection = 0); - const string &getFile() { return file; } - const string &getDir() { return dir; } + const std::string &getFile() { return file; } + const std::string &getDir() { return dir; } }; -#endif /*SELECTOR_H_*/ +#endif // SELECTOR_H diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp index 892c45f..6bbfe6b 100644 --- a/src/settingsdialog.cpp +++ b/src/settingsdialog.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -18,11 +18,14 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include "settingsdialog.h" + +#include "gmenu2x.h" +#include "menusetting.h" + #include #include -#include "settingsdialog.h" - using namespace std; SettingsDialog::SettingsDialog( diff --git a/src/settingsdialog.h b/src/settingsdialog.h index 832ca56..d87247c 100644 --- a/src/settingsdialog.h +++ b/src/settingsdialog.h @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -18,29 +18,29 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef SETTINGSDIALOG_H_ -#define SETTINGSDIALOG_H_ +#ifndef SETTINGSDIALOG_H +#define SETTINGSDIALOG_H -#include -#include "gmenu2x.h" -#include "menusetting.h" #include "dialog.h" -using std::string; -using std::vector; +#include +#include class InputManager; +class MenuSetting; class Touchscreen; class SettingsDialog : protected Dialog { private: InputManager &inputMgr; Touchscreen &ts; - vector voices; - string text, icon; + std::vector voices; + std::string text, icon; public: - SettingsDialog(GMenu2X *gmenu2x, InputManager &inputMgr, Touchscreen &ts, const string &text, const string &icon="skin:sections/settings.png"); + SettingsDialog(GMenu2X *gmenu2x, InputManager &inputMgr, Touchscreen &ts, + const std::string &text, + const std::string &icon = "skin:sections/settings.png"); ~SettingsDialog(); bool edited(); @@ -48,4 +48,4 @@ public: void addSetting(MenuSetting* set); }; -#endif /*INPUTDIALOG_H_*/ +#endif // SETTINGSDIALOG_H diff --git a/src/textdialog.cpp b/src/textdialog.cpp index 159aa71..02fb921 100644 --- a/src/textdialog.cpp +++ b/src/textdialog.cpp @@ -20,6 +20,8 @@ #include "textdialog.h" +#include "gmenu2x.h" + using namespace std; TextDialog::TextDialog(GMenu2X *gmenu2x, const string &title, const string &description, const string &icon, vector *text) @@ -33,7 +35,7 @@ TextDialog::TextDialog(GMenu2X *gmenu2x, const string &title, const string &desc } void TextDialog::preProcess() { - uint i=0; + unsigned i = 0; string row; while (isize()) { @@ -45,12 +47,12 @@ void TextDialog::preProcess() { vector words; split(words, row, " "); - uint numWords = words.size(); + unsigned numWords = words.size(); //find the maximum number of rows that can be printed on screen while (gmenu2x->font->getTextWidth(row)>(int)gmenu2x->resX-15 && numWords>0) { numWords--; row = ""; - for (uint x=0; x *text, uint firstRow, uint rowsPerPage) { +void TextDialog::drawText(vector *text, unsigned firstRow, + unsigned rowsPerPage) { gmenu2x->s->setClipRect(0,41,gmenu2x->resX-10,gmenu2x->resY-60); - for (uint i=firstRow; isize(); i++) { + for (unsigned i=firstRow; isize(); i++) { int rowY; if (text->at(i)=="----") { //draw a line rowY = 42+(int)((i-firstRow+0.5)*gmenu2x->font->getHeight()); @@ -113,8 +116,8 @@ void TextDialog::exec() { bg.convertToDisplayFormat(); - uint firstRow = 0; - uint rowsPerPage = (gmenu2x->resY - 60) / gmenu2x->font->getHeight(); + unsigned firstRow = 0; + unsigned rowsPerPage = (gmenu2x->resY - 60) / gmenu2x->font->getHeight(); while (!close) { bg.blit(gmenu2x->s, 0, 0); drawText(text, firstRow, rowsPerPage); diff --git a/src/textdialog.h b/src/textdialog.h index 2b7e40b..7eb798f 100644 --- a/src/textdialog.h +++ b/src/textdialog.h @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -18,27 +18,28 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef TEXTDIALOG_H_ -#define TEXTDIALOG_H_ +#ifndef TEXTDIALOG_H +#define TEXTDIALOG_H -#include -#include "gmenu2x.h" #include "dialog.h" -using std::string; -using std::vector; +#include +#include class TextDialog : protected Dialog { protected: - vector *text; - string title, description, icon; + std::vector *text; + std::string title, description, icon; void preProcess(); - void drawText(vector *text, uint firstRow, uint rowsPerPage); + void drawText(std::vector *text, unsigned firstRow, + unsigned rowsPerPage); public: - TextDialog(GMenu2X *gmenu2x, const string &title, const string &description, const string &icon, vector *text); + TextDialog(GMenu2X *gmenu2x, const std::string &title, + const std::string &description, const std::string &icon, + std::vector *text); void exec(); }; -#endif /*TEXTDIALOG_H_*/ +#endif // TEXTDIALOG_H diff --git a/src/textmanualdialog.cpp b/src/textmanualdialog.cpp index 1952bfa..23b8e56 100644 --- a/src/textmanualdialog.cpp +++ b/src/textmanualdialog.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -18,9 +18,12 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include #include "textmanualdialog.h" +#include "gmenu2x.h" + +#include + using namespace std; TextManualDialog::TextManualDialog(GMenu2X *gmenu2x, const string &title, const string &icon, vector *text) diff --git a/src/textmanualdialog.h b/src/textmanualdialog.h index 98ea8f7..5669d65 100644 --- a/src/textmanualdialog.h +++ b/src/textmanualdialog.h @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -18,28 +18,27 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef TEXTMANUALDIALOG_H_ -#define TEXTMANUALDIALOG_H_ +#ifndef TEXTMANUALDIALOG_H +#define TEXTMANUALDIALOG_H + +#include "textdialog.h" #include -#include "textdialog.h" -#include "gmenu2x.h" - -using std::string; -using std::vector; +#include struct ManualPage { - string title; - vector text; + std::string title; + std::vector text; }; class TextManualDialog : public TextDialog { private: - vector pages; + std::vector pages; public: - TextManualDialog(GMenu2X *gmenu2x, const string &title, const string &icon, vector *text); + TextManualDialog(GMenu2X *gmenu2x, const std::string &title, + const std::string &icon, std::vector *text); void exec(); }; -#endif /*TEXTMANUALDIALOG_H_*/ +#endif // TEXTMANUALDIALOG_H diff --git a/src/wallpaperdialog.cpp b/src/wallpaperdialog.cpp index ddc2b17..5ec3c34 100644 --- a/src/wallpaperdialog.cpp +++ b/src/wallpaperdialog.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -18,12 +18,14 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include - #include "wallpaperdialog.h" -#include "filelister.h" -#include "buttonbox.h" + #include "debug.h" +#include "buttonbox.h" +#include "filelister.h" +#include "gmenu2x.h" + +#include using namespace std; diff --git a/src/wallpaperdialog.h b/src/wallpaperdialog.h index d7acb82..39590dc 100644 --- a/src/wallpaperdialog.h +++ b/src/wallpaperdialog.h @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * + * Copyright (C) 2006 by Massimiliano Torromeo * + * massimiliano.torromeo@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -18,22 +18,19 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef WALLPAPERDIALOG_H_ -#define WALLPAPERDIALOG_H_ +#ifndef WALLPAPERDIALOG_H +#define WALLPAPERDIALOG_H -#include -#include "gmenu2x.h" #include "dialog.h" -using std::string; -using std::vector; +#include class WallpaperDialog : protected Dialog { public: WallpaperDialog(GMenu2X *gmenu2x); - string wallpaper; + std::string wallpaper; bool exec(); }; -#endif /*WALLPAPERDIALOG_H_*/ +#endif // WALLPAPERDIALOG_H