From e58785f7e68186798532d769b2610dfc3725ab0d Mon Sep 17 00:00:00 2001 From: sln Date: Thu, 9 Apr 2009 06:29:34 +0000 Subject: [PATCH] linux compilation. Windows style end of lines --- src/LightApp/LightApp_PreferencesDlg.h | 124 +++++++++++++------------ src/Plot2d/Plot2d_SetupCurvesDlg.cxx | 24 ----- 2 files changed, 63 insertions(+), 85 deletions(-) diff --git a/src/LightApp/LightApp_PreferencesDlg.h b/src/LightApp/LightApp_PreferencesDlg.h index 876052509..f3710647f 100644 --- a/src/LightApp/LightApp_PreferencesDlg.h +++ b/src/LightApp/LightApp_PreferencesDlg.h @@ -1,61 +1,63 @@ -// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library 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 -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// File: LightApp_PreferencesDlg.h -// Author: Sergey TELKOV - -#ifndef LIGHTAPP_PREFERENCESDLG_H -#define LIGHTAPP_PREFERENCESDLG_H - -#include "LightApp.h" - -#include - -class LightApp_Preferences; - -/*! - \class LightApp_PreferencesDlg - Dialog for preferences edition -*/ -class LIGHTAPP_EXPORT LightApp_PreferencesDlg : public QtxDialog -{ - Q_OBJECT - -public: - LightApp_PreferencesDlg( LightApp_Preferences*, QWidget* = 0 ); - virtual ~LightApp_PreferencesDlg(); - - virtual void setVisible(bool visible); - virtual void accept(); - virtual void reject(); - - bool isSaved() { return mySaved; } - void setSaved( bool saved ) { mySaved = saved; } - -private slots: - void onHelp(); - void onApply(); - void onDefault(); - void onImportPref(); - -private: - LightApp_Preferences* myPrefs; - bool mySaved; -}; - -#endif +// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library 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 +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File: LightApp_PreferencesDlg.h +// Author: Sergey TELKOV + +#ifndef LIGHTAPP_PREFERENCESDLG_H +#define LIGHTAPP_PREFERENCESDLG_H + +#include "LightApp.h" +#include "LightApp_Preferences.h" + +#include + +#include + +/*! + \class LightApp_PreferencesDlg + Dialog for preferences edition +*/ +class LIGHTAPP_EXPORT LightApp_PreferencesDlg : public QtxDialog +{ + Q_OBJECT + +public: + LightApp_PreferencesDlg( LightApp_Preferences*, QWidget* = 0 ); + virtual ~LightApp_PreferencesDlg(); + + virtual void setVisible(bool visible); + virtual void accept(); + virtual void reject(); + + bool isSaved() { return mySaved; } + void setSaved( bool saved ) { mySaved = saved; } + +private slots: + void onHelp(); + void onApply(); + void onDefault(); + void onImportPref(); + +private: + typedef QPointer PrefPtr; + PrefPtr myPrefs; + bool mySaved; +}; + +#endif diff --git a/src/Plot2d/Plot2d_SetupCurvesDlg.cxx b/src/Plot2d/Plot2d_SetupCurvesDlg.cxx index 3b403a677..904bcd9a4 100755 --- a/src/Plot2d/Plot2d_SetupCurvesDlg.cxx +++ b/src/Plot2d/Plot2d_SetupCurvesDlg.cxx @@ -616,27 +616,3 @@ void Plot2d_SetupCurvesDlg::setColor( QPushButton* theBtn, const QColor& theColo aPalette.setColor( QColorGroup::Midlight, theColor ); theBtn->setPalette( aPalette );*/ } - - - - - - - - - - - - - - - - - - - - - - - - -- 2.39.2