diff options
| author | deva <deva> | 2005-05-03 08:31:58 +0000 | 
|---|---|---|
| committer | deva <deva> | 2005-05-03 08:31:58 +0000 | 
| commit | 16aeeeb8110893e14c2d134542981cdc0f257411 (patch) | |
| tree | fbcd9ec22c27d9f82a049055ec9d37035a1e3c03 /src/mainwindow.h | |
| parent | a8456a6a949178ff06ca66cc10c0079da9f9f067 (diff) | |
Removed the error object, and replaced it with a more generic info object.
Diffstat (limited to 'src/mainwindow.h')
| -rw-r--r-- | src/mainwindow.h | 39 | 
1 files changed, 22 insertions, 17 deletions
| diff --git a/src/mainwindow.h b/src/mainwindow.h index 2390c21..78bdd75 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -8,25 +8,32 @@   ****************************************************************************/  /* - *  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 - *  the Free Software Foundation; either version 2 of the License, or - *  (at your option) any later version. + *    This file is part of MIaV.   * - *  This program is distributed in the hope that it will be useful, - *  but WITHOUT ANY WARRANTY; without even the implied warranty of - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the - *  GNU Library General Public License for more details. + *    MIaV is free software; you can redistribute it and/or modify + *    it under the terms of the GNU General Public License as published by + *    the Free Software Foundation; either version 2 of the License, or + *    (at your option) any later version.   * - *  You should have received a copy of the GNU General Public License - *  along with this program; if not, write to the Free Software - *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *    MIaV is distributed in the hope that it will be useful, + *    but WITHOUT ANY WARRANTY; without even the implied warranty of + *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + *    GNU General Public License for more details. + * + *    You should have received a copy of the GNU General Public License + *    along with MIaV; if not, write to the Free Software + *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.   */ +  /*   * $Id$   */ +  /*   * $Log$ + * Revision 1.11  2005/05/03 08:31:59  deva + * Removed the error object, and replaced it with a more generic info object. + *   * Revision 1.10  2005/05/02 20:34:38  deva   *   * Some hacked borky ugly scumm code to check for errors! :( @@ -38,8 +45,8 @@   *   * Revision 1.8  2005/05/01 09:56:26  deva   * Added Id and Log tags to all files - *   */ +  #include <config.h>  #ifdef USE_GUI @@ -59,7 +66,7 @@ using namespace std;  #include "camera.h"  #include "cprquerydialog.h" -#include "error.h" +#include "info_gui.h"  #define NUM_HISTORY 3 @@ -105,16 +112,14 @@ public slots:    void shoot_clicked();    void freeze_clicked();    void redraw_edge(); -  void check_errors();  private: -  Error *error; +  Info *info; -  void checkErrors();    void createGui();    Camera *camera; -  Error *cam_error; +  Info *cam_info;    QPixmap *pix_unfreeze;    QPixmap *pix_freeze; | 
