diff --git a/src/frontends/qt2/Alert_pimpl.C b/src/frontends/qt2/Alert_pimpl.C index 6538fe1ed7..657b473103 100644 --- a/src/frontends/qt2/Alert_pimpl.C +++ b/src/frontends/qt2/Alert_pimpl.C @@ -1,13 +1,19 @@ /** * \file qt2/Alert_pimpl.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include #include #include diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index ac84d963fc..2c67f902f8 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,17 @@ +2002-09-24 Angus Leeming + + * most files: "standard-conforming" Licence declaration. + Remove trailing whitespace. + + * many header files: do not #include . + Remove unnecessary #includes by using forward declarations. + Add as first line: // -*- C++ -*- + Move several definitions of virtual functions out of line + as they are unlikely to be inlined anyway (and it reduces + header file dependencies)... + + * many files: added g++ #pragma directives. + 2002-09-23 Angus Leeming * QMath.h: forward declare QMathDialog. diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C index 6c66c75137..6d7962e9f4 100644 --- a/src/frontends/qt2/Dialogs.C +++ b/src/frontends/qt2/Dialogs.C @@ -1,11 +1,13 @@ /** * \file qt2/Dialogs.C * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. - * See the file COPYING. + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Allan Rae, rae@lyx.org - * \author Angus Leeming + * \author Allan Rae + * \author Angus Leeming + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/Dialogs2.C b/src/frontends/qt2/Dialogs2.C index 44a349332b..588bbe9d5a 100644 --- a/src/frontends/qt2/Dialogs2.C +++ b/src/frontends/qt2/Dialogs2.C @@ -1,11 +1,13 @@ /** * \file xforms/Dialogs.C * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. - * See the file COPYING. + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Allan Rae, rae@lyx.org - * \author Angus Leeming + * \author Allan Rae + * \author Angus Leeming + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/Dialogs_impl.h b/src/frontends/qt2/Dialogs_impl.h index c17d7659a5..50ec4257f0 100644 --- a/src/frontends/qt2/Dialogs_impl.h +++ b/src/frontends/qt2/Dialogs_impl.h @@ -1,9 +1,11 @@ // -*- C++ -*- /** * \file Dialogs_impl.h - * Copyright 1995-2002 The LyX Team. - * See the file COPYING. - * \author Angus Leeming + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * \author Angus Leeming + * + * Full author contact details are available in file CREDITS */ #ifndef DIALOGS_IMPL_H diff --git a/src/frontends/qt2/FileDialog.C b/src/frontends/qt2/FileDialog.C index a5c319502a..0aad7f0e39 100644 --- a/src/frontends/qt2/FileDialog.C +++ b/src/frontends/qt2/FileDialog.C @@ -1,9 +1,11 @@ /** * \file qt2/FileDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifdef __GNUG__ diff --git a/src/frontends/qt2/FileDialog_private.C b/src/frontends/qt2/FileDialog_private.C index dc61f7e9ff..8f68d8caca 100644 --- a/src/frontends/qt2/FileDialog_private.C +++ b/src/frontends/qt2/FileDialog_private.C @@ -1,25 +1,29 @@ /** * \file FileDialog_private.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include -#include "LString.h" -#include "support/lstrings.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include -#include -#include +#include + +#include "FileDialog_private.h" #include "QtLyXView.h" #include "debug.h" #include "funcrequest.h" - -#include "FileDialog_private.h" +#include "lyxfunc.h" +#include "support/lstrings.h" namespace { /// return the Qt form of the label @@ -35,7 +39,7 @@ namespace { return label; } } - + LyXFileDialog::LyXFileDialog(string const & p, string const & m, string const & t, FileDialog::Button const & b1, FileDialog::Button const & b2) : QFileDialog(p.c_str(), m.c_str(), qApp->mainWidget(), t.c_str(), true), @@ -43,7 +47,7 @@ LyXFileDialog::LyXFileDialog(string const & p, string const & m, string const & { setCaption(t.c_str()); - if (!b1.first.empty()) { + if (!b1.first.empty()) { b1_dir_ = b1.second; b1_ = new QToolButton(this); connect(b1_, SIGNAL(clicked()), this, SLOT(buttonClicked())); diff --git a/src/frontends/qt2/FileDialog_private.h b/src/frontends/qt2/FileDialog_private.h index 6870f7f762..5062f226b2 100644 --- a/src/frontends/qt2/FileDialog_private.h +++ b/src/frontends/qt2/FileDialog_private.h @@ -1,23 +1,24 @@ // -*- C++ -*- /** * \file FileDialog_private.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef FILEDIALOG_PRIVATE_H #define FILEDIALOG_PRIVATE_H -#include - -#include "LString.h" -#include "lyxfunc.h" +#ifdef __GNUG__ +#pragma interface +#endif #include "frontends/FileDialog.h" - #include +#include "LString.h" class QToolButton; @@ -30,11 +31,11 @@ public: public slots: void buttonClicked(); - + private: QToolButton * b1_; string b1_dir_; - + QToolButton * b2_; string b2_dir_; }; diff --git a/src/frontends/qt2/LyXKeySymFactory.C b/src/frontends/qt2/LyXKeySymFactory.C index d748f312d5..706b18c4ba 100644 --- a/src/frontends/qt2/LyXKeySymFactory.C +++ b/src/frontends/qt2/LyXKeySymFactory.C @@ -1,13 +1,19 @@ /** * \file LyXKeySymFactory.C - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author Asger & Juergen + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "frontends/LyXKeySymFactory.h" #include "QLyXKeySym.h" diff --git a/src/frontends/qt2/LyXScreenFactory.C b/src/frontends/qt2/LyXScreenFactory.C index b3abdcc222..a5a0f2b2d9 100644 --- a/src/frontends/qt2/LyXScreenFactory.C +++ b/src/frontends/qt2/LyXScreenFactory.C @@ -1,13 +1,19 @@ /** * \file LyXScreenFactory.C - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "frontends/LyXScreenFactory.h" #include "QWorkArea.h" diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am index 5de0fe5bbf..7584392277 100644 --- a/src/frontends/qt2/Makefile.am +++ b/src/frontends/qt2/Makefile.am @@ -59,6 +59,7 @@ libqt2_la_SOURCES = \ iconpalette.h \ iconpalette.C \ io_callback.h \ + io_callback.C \ lengthcombo.C \ lengthcombo.h \ lyx_gui.C \ diff --git a/src/frontends/qt2/Menubar_pimpl.C b/src/frontends/qt2/Menubar_pimpl.C index 1dbe51efa0..1747534dc2 100644 --- a/src/frontends/qt2/Menubar_pimpl.C +++ b/src/frontends/qt2/Menubar_pimpl.C @@ -1,9 +1,11 @@ /** * \file Menubar_pimpl.C - * Copyright 1999-2001 The LyX Team. - * See the file COPYING. + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes, larsbj@lyx.org + * \author Lars Gullik Bjønnes + * + * Full author contact details are available in file CREDITS */ #include @@ -28,10 +30,10 @@ #include "QtView.h" #include "QLPopupMenu.h" - + #include #include - + using std::endl; using std::vector; using std::max; @@ -39,7 +41,7 @@ using std::min; using std::for_each; using std::pair; -Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mbe) +Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mbe) : owner_(static_cast(view)), menubackend_(mbe) { Menu::const_iterator m = mbe.getMenubar().begin(); @@ -54,8 +56,8 @@ Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mbe) void Menubar::Pimpl::openByName(string const & name) { - NameMap::const_iterator const cit = name_map_.find(name); - if (cit == name_map_.end()) + NameMap::const_iterator const cit = name_map_.find(name); + if (cit == name_map_.end()) return; // this will have to do I'm afraid. diff --git a/src/frontends/qt2/Menubar_pimpl.h b/src/frontends/qt2/Menubar_pimpl.h index 37755e7615..4b0fb36aa7 100644 --- a/src/frontends/qt2/Menubar_pimpl.h +++ b/src/frontends/qt2/Menubar_pimpl.h @@ -1,27 +1,26 @@ // -*- C++ -*- /** * \file Menubar_pimpl.h - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes - * \author John Levon + * \author Lars Gullik Bjønnes + * \author John Levon + * + * Full author contact details are available in file CREDITS */ - + #ifndef MENUBAR_PIMPL_H #define MENUBAR_PIMPL_H -#include - -#include - #ifdef __GNUG__ #pragma interface #endif -#include "LString.h" #include "frontends/Menubar.h" +#include "LString.h" +#include class LyXView; class QtView; @@ -31,7 +30,7 @@ class QLPopupMenu; struct Menubar::Pimpl { public: Pimpl(LyXView *, MenuBackend const &); - + /// opens a top-level submenu given its name void openByName(string const &); @@ -39,7 +38,7 @@ public: void update() {}; /// return the owning view - QtView * view() { return owner_; } + QtView * view() { return owner_; } /// return the menu controller MenuBackend const & backend() { return menubackend_; } @@ -52,8 +51,8 @@ private: typedef std::map NameMap; - /// name to menu for openByName + /// name to menu for openByName NameMap name_map_; }; - + #endif // MENUBAR_PIMPL_H diff --git a/src/frontends/qt2/QAbout.C b/src/frontends/qt2/QAbout.C index 250283198c..b342235839 100644 --- a/src/frontends/qt2/QAbout.C +++ b/src/frontends/qt2/QAbout.C @@ -1,13 +1,19 @@ /** * \file QAbout.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Kalle Dalheimer + * \author Kalle Dalheimer + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "support/lstrings.h" #include "Lsstream.h" #include "debug.h" diff --git a/src/frontends/qt2/QAbout.h b/src/frontends/qt2/QAbout.h index 00c360627d..3ae8d76b63 100644 --- a/src/frontends/qt2/QAbout.h +++ b/src/frontends/qt2/QAbout.h @@ -1,19 +1,23 @@ // -*- C++ -*- /** * \file QAbout.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Kalle Dalheimer + * \author Kalle Dalheimer + * + * Full author contact details are available in file CREDITS */ #ifndef FORMABOUT_H #define FORMABOUT_H -#include "Qt2Base.h" -#include "boost/utility.hpp" +#ifdef __GNUG__ +#pragma interface +#endif + +#include "Qt2Base.h" -class LyXView; class QAboutDialog; class ControlAboutlyx; diff --git a/src/frontends/qt2/QAboutDialog.C b/src/frontends/qt2/QAboutDialog.C index c6cb3e418e..e1b843c6ac 100644 --- a/src/frontends/qt2/QAboutDialog.C +++ b/src/frontends/qt2/QAboutDialog.C @@ -1,11 +1,19 @@ /** * \file QAboutDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Kalle Dalheimer + * \author Kalle Dalheimer + * + * Full author contact details are available in file CREDITS */ +#include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include "QAboutDialog.h" QAboutDialog::QAboutDialog(QWidget * parent, const char * name, bool modal, WFlags fl) diff --git a/src/frontends/qt2/QAboutDialog.h b/src/frontends/qt2/QAboutDialog.h index cf8c485cf5..d14c568594 100644 --- a/src/frontends/qt2/QAboutDialog.h +++ b/src/frontends/qt2/QAboutDialog.h @@ -1,13 +1,21 @@ +// -*- C++ -*- /** * \file QAboutDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Kalle Dalheimer + * \author Kalle Dalheimer + * + * Full author contact details are available in file CREDITS */ #ifndef QABOUTDIALOG_H #define QABOUTDIALOG_H + +#ifdef __GNUG__ +#pragma interface +#endif + #include "ui/QAboutDialogBase.h" class QAboutDialog : public QAboutDialogBase diff --git a/src/frontends/qt2/QBibitem.C b/src/frontends/qt2/QBibitem.C index c96dbfcc62..1b6c65caf3 100644 --- a/src/frontends/qt2/QBibitem.C +++ b/src/frontends/qt2/QBibitem.C @@ -1,13 +1,19 @@ /** * \file QBibitem.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "support/lstrings.h" #include "ControlBibitem.h" diff --git a/src/frontends/qt2/QBibitem.h b/src/frontends/qt2/QBibitem.h index 0797c31581..e1310d6bcb 100644 --- a/src/frontends/qt2/QBibitem.h +++ b/src/frontends/qt2/QBibitem.h @@ -1,15 +1,21 @@ // -*- C++ -*- /** * \file QBibitem.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QBIBITEM_H #define QBIBITEM_H +#ifdef __GNUG__ +#pragma interface +#endif + #include "Qt2Base.h" class ControlBibitem; diff --git a/src/frontends/qt2/QBibitemDialog.C b/src/frontends/qt2/QBibitemDialog.C index ff05e6f33d..6029549722 100644 --- a/src/frontends/qt2/QBibitemDialog.C +++ b/src/frontends/qt2/QBibitemDialog.C @@ -1,13 +1,19 @@ /** * \file QBibitemDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "ControlBibitem.h" #include diff --git a/src/frontends/qt2/QBibitemDialog.h b/src/frontends/qt2/QBibitemDialog.h index e3c10fca77..f64b3bda3f 100644 --- a/src/frontends/qt2/QBibitemDialog.h +++ b/src/frontends/qt2/QBibitemDialog.h @@ -1,14 +1,21 @@ +// -*- C++ -*- /** * \file QBibitemDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QBIBITEMDIALOG_H #define QBIBITEMDIALOG_H +#ifdef __GNUG__ +#pragma interface +#endif + #include "ui/QBibitemDialogBase.h" class QBibitem; diff --git a/src/frontends/qt2/QBibtex.C b/src/frontends/qt2/QBibtex.C index 16f20bee0c..d425ca1c89 100644 --- a/src/frontends/qt2/QBibtex.C +++ b/src/frontends/qt2/QBibtex.C @@ -1,13 +1,19 @@ /** * \file QBibtex.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "support/lstrings.h" #include "ControlBibtex.h" diff --git a/src/frontends/qt2/QBibtex.h b/src/frontends/qt2/QBibtex.h index 8528a260df..bea81b1645 100644 --- a/src/frontends/qt2/QBibtex.h +++ b/src/frontends/qt2/QBibtex.h @@ -1,15 +1,21 @@ // -*- C++ -*- /** * \file QBibtex.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QBIBTEX_H #define QBIBTEX_H +#ifdef __GNUG__ +#pragma interface +#endif + #include "Qt2Base.h" class ControlBibtex; diff --git a/src/frontends/qt2/QBibtexDialog.C b/src/frontends/qt2/QBibtexDialog.C index 966c143e2f..460e319f13 100644 --- a/src/frontends/qt2/QBibtexDialog.C +++ b/src/frontends/qt2/QBibtexDialog.C @@ -1,13 +1,20 @@ /** * \file QBibtexDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include -#include + +#ifdef __GNUG__ +#pragma implementation +#endif + +#include #include "ControlBibtex.h" #include "gettext.h" #include "debug.h" @@ -24,7 +31,7 @@ #include "QBibtexDialog.h" #include "QBibtex.h" - + QBibtexDialog::QBibtexDialog(QBibtex * form) : QBibtexDialogBase(0, 0, false, 0), form_(form) @@ -67,7 +74,7 @@ void QBibtexDialog::addPressed() for(unsigned int i = 0; i!=databaseLB->count(); i++) { if (databaseLB->text(i).latin1()==f) present = true; - + } if (!present) { databaseLB->insertItem(f.c_str()); diff --git a/src/frontends/qt2/QBibtexDialog.h b/src/frontends/qt2/QBibtexDialog.h index 9ab1693720..1363871ac5 100644 --- a/src/frontends/qt2/QBibtexDialog.h +++ b/src/frontends/qt2/QBibtexDialog.h @@ -1,22 +1,28 @@ +// -*- C++ -*- /** * \file QBibtexDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QBIBTEXDIALOG_H #define QBIBTEXDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "ui/QBibtexDialogBase.h" class QBibtex; class QBibtexDialog : public QBibtexDialogBase -{ Q_OBJECT +{ + Q_OBJECT public: QBibtexDialog(QBibtex * form); @@ -29,7 +35,6 @@ protected slots: virtual void styleChanged(const QString &); virtual void databaseChanged(); - protected: virtual void closeEvent(QCloseEvent * e); diff --git a/src/frontends/qt2/QCharacter.C b/src/frontends/qt2/QCharacter.C index ecc9e8eed6..aa3ac5ef3a 100644 --- a/src/frontends/qt2/QCharacter.C +++ b/src/frontends/qt2/QCharacter.C @@ -1,27 +1,34 @@ /** * \file QCharacter.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Edwin Leuven, leuven@fee.uva.nl - * \author John Levon + * \author Edwin Leuven + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include -#include - -#include "gettext.h" -#include "support/lstrings.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ControlCharacter.h" #include "QCharacterDialog.h" #include "QCharacter.h" #include "Qt2BC.h" + +#include "gettext.h" +#include "support/lstrings.h" + #include #include #include +#include + using namespace frnt; using std::vector; diff --git a/src/frontends/qt2/QCharacter.h b/src/frontends/qt2/QCharacter.h index 2c059e20ca..e760d99bbe 100644 --- a/src/frontends/qt2/QCharacter.h +++ b/src/frontends/qt2/QCharacter.h @@ -1,24 +1,29 @@ // -*- C++ -*- /** * \file QCharacter.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Edwin Leuven, leuven@fee.uva.nl - * \author John Levon + * \author Edwin Leuven + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QCHARACTER_H #define QCHARACTER_H -#include -#include +#ifdef __GNUG__ +#pragma interface +#endif -#include "LString.h" #include "Qt2Base.h" #include "controllers/character.h" #include "controllers/frnt_lang.h" +#include "LString.h" +#include + class ControlCharacter; class QCharacterDialog; diff --git a/src/frontends/qt2/QCharacterDialog.C b/src/frontends/qt2/QCharacterDialog.C index 4a62097465..8afcf1ae7e 100644 --- a/src/frontends/qt2/QCharacterDialog.C +++ b/src/frontends/qt2/QCharacterDialog.C @@ -1,11 +1,19 @@ /** * \file QCharacterDialog.C - * Copyright 2001 the LyX Team - * See the file COPYING. + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Edwin Leuven, leuven@fee.uva.nl + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ +#include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include "QCharacterDialog.h" #include diff --git a/src/frontends/qt2/QCharacterDialog.h b/src/frontends/qt2/QCharacterDialog.h index 6c0600c1bb..0827c66a58 100644 --- a/src/frontends/qt2/QCharacterDialog.h +++ b/src/frontends/qt2/QCharacterDialog.h @@ -1,16 +1,21 @@ +// -*- C++ -*- /** * \file QCharacterDialog.h - * Copyright 2001 the LyX Team - * see the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author Edwin Leuven - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QCHARACTERDIALOG_H #define QCHARACTERDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "QCharacter.h" #include "ui/QCharacterDialogBase.h" diff --git a/src/frontends/qt2/QCitation.C b/src/frontends/qt2/QCitation.C index d0e079eefc..e8b9d2048a 100644 --- a/src/frontends/qt2/QCitation.C +++ b/src/frontends/qt2/QCitation.C @@ -1,10 +1,12 @@ /** * \file QCitation.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Angus Leeming - * \author Kalle Dalheimer + * \author Angus Leeming + * \author Kalle Dalheimer + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QCitation.h b/src/frontends/qt2/QCitation.h index 0224fec758..88af469afc 100644 --- a/src/frontends/qt2/QCitation.h +++ b/src/frontends/qt2/QCitation.h @@ -1,11 +1,13 @@ // -*- C++ -*- /** * \file QCitation.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Angus Leeming - * \author Kalle Dalheimer + * \author Angus Leeming + * \author Kalle Dalheimer + * + * Full author contact details are available in file CREDITS */ #ifndef QCITATION_H @@ -15,10 +17,9 @@ #pragma interface #endif -class QListBox; - #include "Qt2Base.h" +class QListBox; class ControlCitation; class QCitationDialog; diff --git a/src/frontends/qt2/QCitationDialog.C b/src/frontends/qt2/QCitationDialog.C index e56bebf836..74d45f960c 100644 --- a/src/frontends/qt2/QCitationDialog.C +++ b/src/frontends/qt2/QCitationDialog.C @@ -1,13 +1,19 @@ /** * \file QCitationDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Kalle Dalheimer + * \author Kalle Dalheimer + * + * Full author contact details are available in file CREDITS */ #include - + +#ifdef __GNUG__ +#pragma implementation +#endif + #include #include "gettext.h" @@ -23,7 +29,9 @@ #include #include "QCitationDialog.h" - +#include "QCitation.h" +#include "support/lstrings.h" + using std::vector; using std::find; using std::max; @@ -242,6 +250,12 @@ void QCitationDialog::slotNextClicked() } +void QCitationDialog::changed_adaptor() +{ + form_->changed(); +} + + void QCitationDialog::doFind(biblio::Direction dir) { biblio::InfoMap const & theMap = form_->controller().bibkeysInfo(); @@ -281,7 +295,7 @@ void QCitationDialog::doFind(biblio::Direction dir) if (cit == form_->bibkeys.end()) return; } - + int const found = int(cit - form_->bibkeys.begin()); if (found == sel) { return; diff --git a/src/frontends/qt2/QCitationDialog.h b/src/frontends/qt2/QCitationDialog.h index bd2ab44685..c1581ed4cb 100644 --- a/src/frontends/qt2/QCitationDialog.h +++ b/src/frontends/qt2/QCitationDialog.h @@ -1,21 +1,26 @@ +// -*- C++ -*- /** * \file QCitationDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Kalle Dalheimer + * \author Kalle Dalheimer + * + * Full author contact details are available in file CREDITS */ #ifndef QCITATIONDIALOG_H #define QCITATIONDIALOG_H -#include -#include "support/lstrings.h" +#ifdef __GNUG__ +#pragma interface +#endif -#include "QCitation.h" #include "ui/QCitationDialogBase.h" #include "controllers/biblio.h" +class QCitation; + class QCitationDialog : public QCitationDialogBase { Q_OBJECT @@ -33,10 +38,7 @@ protected slots: virtual void slotDownClicked(); virtual void slotPreviousClicked(); virtual void slotNextClicked(); - - virtual void changed_adaptor() { - form_->changed(); - } + virtual void changed_adaptor(); private: void doFind(biblio::Direction dir); diff --git a/src/frontends/qt2/QCommandBuffer.C b/src/frontends/qt2/QCommandBuffer.C index 9d77b01df3..65bee21cf8 100644 --- a/src/frontends/qt2/QCommandBuffer.C +++ b/src/frontends/qt2/QCommandBuffer.C @@ -1,31 +1,39 @@ /** * \file QCommandBuffer.C - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include - + +#ifdef __GNUG__ +#pragma implementation +#endif + #include "support/filetools.h" #include "controllers/ControlCommandBuffer.h" #include "gettext.h" #include "debug.h" - + #include "QtView.h" #include "QCommandBuffer.h" #include "QCommandEdit.h" - + #include #include #include #include +#include "LString.h" + using std::vector; namespace { - + class QTempListBox : public QListBox { public: QTempListBox() @@ -33,7 +41,7 @@ public: WType_Modal | WType_Popup | WDestructiveClose) { setHScrollBarMode(AlwaysOff); } - + protected: void mouseReleaseEvent(QMouseEvent * e) { if (e->x() < 0 || e->y() < 0 @@ -43,7 +51,7 @@ protected: emit selected(currentText()); } } - + void keyPressEvent(QKeyEvent * e) { if (e->key() == Key_Escape) { hide(); @@ -54,27 +62,27 @@ protected: }; } - + QCommandBuffer::QCommandBuffer(QtView * view, ControlCommandBuffer & control) : QToolBar(view), view_(view), controller_(control) { setHorizontalStretchable(true); - + QPixmap qp(LibFileSearch("images", "unknown", "xpm").c_str()); QToolButton * upb = new QToolButton(qp, _("Up"), "", this, SLOT(up()), this); upb->show(); - + QToolButton * downb = new QToolButton(qp, _("Down"), "", this, SLOT(down()), this); downb->show(); - + edit_ = new QCommandEdit(this); edit_->setMinimumSize(edit_->sizeHint()); edit_->show(); setStretchableWidget(edit_); - + show(); - + connect(edit_, SIGNAL(escapePressed()), this, SLOT(cancel())); connect(edit_, SIGNAL(returnPressed()), this, SLOT(dispatch())); connect(edit_, SIGNAL(rightPressed()), this, SLOT(complete())); @@ -89,14 +97,14 @@ void QCommandBuffer::focus_command() edit_->setFocus(); } - + void QCommandBuffer::cancel() { view_->centralWidget()->setFocus(); edit_->setText(""); } - + void QCommandBuffer::dispatch() { controller_.dispatch(edit_->text().latin1()); @@ -110,7 +118,7 @@ void QCommandBuffer::complete() string const input = edit_->text().latin1(); string new_input; vector comp = controller_.completions(input, new_input); - + if (comp.empty() && new_input == input) { // show_info_suffix(_("[no match]"), input); return; @@ -121,32 +129,32 @@ void QCommandBuffer::complete() // show_info_suffix(("[only completion]"), new_input + " "); return; } - + edit_->setText(new_input.c_str()); QTempListBox * list = new QTempListBox(); // For some reason the scrollview's contents are larger - // than the number of actual items... + // than the number of actual items... vector::const_iterator cit = comp.begin(); vector::const_iterator end = comp.end(); for (; cit != end; ++cit) { list->insertItem(cit->c_str()); } - + // width() is not big enough by a few pixels. Qt Sucks. list->setMinimumWidth(list->sizeHint().width() + 10); - + list->resize(list->sizeHint()); - QPoint pos(edit_->mapToGlobal(QPoint(0, 0))); + QPoint pos(edit_->mapToGlobal(QPoint(0, 0))); int y = pos.y() - list->height(); if (y < 0) y = 0; list->move(pos.x(), y); - + connect(list, SIGNAL(selected(const QString &)), - this, SLOT(complete_selected(const QString &))); - + this, SLOT(complete_selected(const QString &))); + list->show(); list->setFocus(); } @@ -159,12 +167,12 @@ void QCommandBuffer::complete_selected(const QString & str) const_cast(widget)->hide(); } - + void QCommandBuffer::up() { string const input = edit_->text().latin1(); string const h(controller_.historyUp()); - + if (h.empty()) { // show_info_suffix(_("[Beginning of history]"), input); } else { @@ -177,7 +185,7 @@ void QCommandBuffer::down() { string const input = edit_->text().latin1(); string const h(controller_.historyDown()); - + if (h.empty()) { // show_info_suffix(_("[End of history]"), input); } else { @@ -186,15 +194,15 @@ void QCommandBuffer::down() } -#if 0 +#if 0 void XMiniBuffer::show_info_suffix(string const & suffix, string const & input) { stored_input_ = input; info_suffix_shown_ = true; - set_input(input + " " + suffix); + set_input(input + " " + suffix); suffix_timer_->start(); } - + void XMiniBuffer::suffix_timeout() { diff --git a/src/frontends/qt2/QCommandBuffer.h b/src/frontends/qt2/QCommandBuffer.h index 194d8869a5..c59c0dfcd5 100644 --- a/src/frontends/qt2/QCommandBuffer.h +++ b/src/frontends/qt2/QCommandBuffer.h @@ -1,25 +1,28 @@ +// -*- C++ -*- /** * \file QCommandBuffer.h - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QCOMMANDBUFFER_H #define QCOMMANDBUFFER_H -#include -#include "LString.h" - +#ifdef __GNUG__ +#pragma interface +#endif + #include -#include - + class QtView; class QCommandEdit; class QListBoxItem; class ControlCommandBuffer; - + class QCommandBuffer : public QToolBar { Q_OBJECT public: @@ -28,7 +31,7 @@ public: /// focus the edit widget void focus_command(); - + public slots: /// cancel command compose void cancel(); @@ -42,7 +45,7 @@ public slots: void up(); /// down void down(); - + private: /// owning view QtView * view_; @@ -52,7 +55,6 @@ private: /// command widget QCommandEdit * edit_; - }; #endif // QCOMMANDBUFFER_H diff --git a/src/frontends/qt2/QCommandEdit.C b/src/frontends/qt2/QCommandEdit.C index bdedfd34c3..ffa846ba17 100644 --- a/src/frontends/qt2/QCommandEdit.C +++ b/src/frontends/qt2/QCommandEdit.C @@ -1,13 +1,19 @@ /** * \file QCommandEdit.C - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include "QCommandEdit.h" +#ifdef __GNUG__ +#pragma implementation +#endif + QCommandEdit::QCommandEdit(QWidget * parent) : QLineEdit(parent) { diff --git a/src/frontends/qt2/QCommandEdit.h b/src/frontends/qt2/QCommandEdit.h index 6ec68ed3ff..e2355b1104 100644 --- a/src/frontends/qt2/QCommandEdit.h +++ b/src/frontends/qt2/QCommandEdit.h @@ -1,16 +1,23 @@ +// -*- C++ -*- /** * \file QCommandEdit.h - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QCOMMANDEDIT_H #define QCOMMANDEDIT_H +#ifdef __GNUG__ +#pragma interface +#endif + #include - + class QCommandEdit : public QLineEdit { Q_OBJECT public: @@ -20,16 +27,16 @@ public: signals: /// cancel void escapePressed(); - + /// up history void upPressed(); - + /// down history void downPressed(); - + /// complete void rightPressed(); - + protected: virtual void keyPressEvent(QKeyEvent * e); }; diff --git a/src/frontends/qt2/QContentPane.C b/src/frontends/qt2/QContentPane.C index 1767f6a191..6eb624e202 100644 --- a/src/frontends/qt2/QContentPane.C +++ b/src/frontends/qt2/QContentPane.C @@ -1,9 +1,11 @@ /** * \file QContentPane.C - * Copyright 1995-2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QContentPane.h b/src/frontends/qt2/QContentPane.h index 1256762dea..d8a7e6c4a3 100644 --- a/src/frontends/qt2/QContentPane.h +++ b/src/frontends/qt2/QContentPane.h @@ -1,10 +1,12 @@ // -*- C++ -*- /** * \file QContentPane.h - * Copyright 1995-2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QCONTENTPANE_H @@ -14,17 +16,13 @@ #pragma interface #endif -#include -#include -#include - #include -#include -#include #include +#include +#include + +class QWorkArea; -class QWorkArea; - /// for emulating triple click struct double_click { int x; @@ -39,7 +37,7 @@ struct double_click { double_click() : x(0), y(0), state(Qt::NoButton), active(false) {} - + double_click(QMouseEvent * e) : x(e->x()), y(e->y()), state(e->button()), active(true) {} @@ -50,40 +48,40 @@ struct double_click { */ class QContentPane : public QWidget { Q_OBJECT - + public: QContentPane(QWorkArea * parent); - + /// return the backing pixmap - QPixmap * pixmap() const { return pixmap_.get(); } - + QPixmap * pixmap() const { return pixmap_.get(); } + protected: /// repaint part of the widget void paintEvent(QPaintEvent * e); /// widget has been resized void resizeEvent(QResizeEvent * e); - + /// mouse button press void mousePressEvent(QMouseEvent * e); - /// mouse button release + /// mouse button release void mouseReleaseEvent(QMouseEvent * e); - /// mouse double click of button + /// mouse double click of button void mouseDoubleClickEvent(QMouseEvent * e); /// mouse motion void mouseMoveEvent(QMouseEvent * e); - + /// key press void keyPressEvent(QKeyEvent * e); - + public slots: void doubleClickTimeout(); - + void scrollBarChanged(int); - + private: /// owning widget QWorkArea * wa_; - + /// the double buffered pixmap boost::scoped_ptr pixmap_; diff --git a/src/frontends/qt2/QDelimiterDialog.C b/src/frontends/qt2/QDelimiterDialog.C index 1536569165..4be8063d0c 100644 --- a/src/frontends/qt2/QDelimiterDialog.C +++ b/src/frontends/qt2/QDelimiterDialog.C @@ -1,13 +1,19 @@ /** * \file QDelimiterDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "support/filetools.h" #include "gettext.h" #include "debug.h" diff --git a/src/frontends/qt2/QDelimiterDialog.h b/src/frontends/qt2/QDelimiterDialog.h index 649a048f41..7c265259c2 100644 --- a/src/frontends/qt2/QDelimiterDialog.h +++ b/src/frontends/qt2/QDelimiterDialog.h @@ -1,19 +1,23 @@ +// -*- C++ -*- /** * \file QDelimiterDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QDELIMITERDIALOG_H #define QDELIMITERDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif -#include "LString.h" - #include "ui/QDelimiterDialogBase.h" +#include "LString.h" class QMath; class IconPalette; @@ -37,12 +41,12 @@ protected: private: void set_label(QLabel * label, string const & str); - /// symbol of left delimiter + /// symbol of left delimiter string left_; /// symbol of right delimiter string right_; - + /// owning form QMath * form_; }; diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C index dded451619..9e762d83ff 100644 --- a/src/frontends/qt2/QDocument.C +++ b/src/frontends/qt2/QDocument.C @@ -1,9 +1,11 @@ /** * \file QDocument.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Kalle Dalheimer + * \author Kalle Dalheimer + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QDocument.h b/src/frontends/qt2/QDocument.h index 456a62e5ca..e72d113ba1 100644 --- a/src/frontends/qt2/QDocument.h +++ b/src/frontends/qt2/QDocument.h @@ -1,28 +1,28 @@ // -*- C++ -*- /** * \file QDocument.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Kalle Dalheimer + * \author Kalle Dalheimer + * + * Full author contact details are available in file CREDITS */ #ifndef QDOCUMENT_H #define QDOCUMENT_H -#include "Qt2Base.h" -#include "Qt2BC.h" -#include "QtLyXView.h" - -#include - -#include - #ifdef __GNUG__ #pragma interface #endif +#include "Qt2Base.h" +#include "Qt2BC.h" +//#include "QtLyXView.h" + +#include + class ControlDocument; class QDocumentDialog; class BufferParams; diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C index 4304f1f5ef..364ca166cc 100644 --- a/src/frontends/qt2/QDocumentDialog.C +++ b/src/frontends/qt2/QDocumentDialog.C @@ -1,13 +1,19 @@ /** * \file QDocumentDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Kalle Dalheimer + * \author Kalle Dalheimer + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "QDocumentDialog.h" #include "Dialogs.h" #include "QDocument.h" diff --git a/src/frontends/qt2/QDocumentDialog.h b/src/frontends/qt2/QDocumentDialog.h index da61d0f7f3..0c0176803d 100644 --- a/src/frontends/qt2/QDocumentDialog.h +++ b/src/frontends/qt2/QDocumentDialog.h @@ -1,14 +1,21 @@ +// -*- C++ -*- /** * \file QDocumentDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Kalle Dalheimer + * \author Kalle Dalheimer + * + * Full author contact details are available in file CREDITS */ #ifndef QDOCUMENTDIALOG_H #define QDOCUMENTDIALOG_H +#ifdef __GNUG__ +#pragma interface +#endif + #include "ui/QDocumentDialogBase.h" class QDocument; diff --git a/src/frontends/qt2/QERT.C b/src/frontends/qt2/QERT.C index f034bcbe77..b26e7e1a7f 100644 --- a/src/frontends/qt2/QERT.C +++ b/src/frontends/qt2/QERT.C @@ -1,13 +1,19 @@ /** * \file QERT.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "ControlERT.h" #include "gettext.h" @@ -17,7 +23,7 @@ #include "QERTDialog.h" #include "QERT.h" #include "Qt2BC.h" - + typedef Qt2CB > base_class; QERT::QERT() diff --git a/src/frontends/qt2/QERT.h b/src/frontends/qt2/QERT.h index fa0bc3f6f4..f9d95e4b0f 100644 --- a/src/frontends/qt2/QERT.h +++ b/src/frontends/qt2/QERT.h @@ -1,15 +1,21 @@ // -*- C++ -*- /** * \file QERT.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QERT_H #define QERT_H +#ifdef __GNUG__ +#pragma interface +#endif + #include "Qt2Base.h" class ControlERT; diff --git a/src/frontends/qt2/QERTDialog.C b/src/frontends/qt2/QERTDialog.C index f2c21410c7..809ef57d1c 100644 --- a/src/frontends/qt2/QERTDialog.C +++ b/src/frontends/qt2/QERTDialog.C @@ -1,13 +1,19 @@ /** * \file QERTDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include - + +#ifdef __GNUG__ +#pragma implementation +#endif + #include "QERT.h" #include "QERTDialog.h" @@ -29,3 +35,9 @@ void QERTDialog::closeEvent(QCloseEvent * e) form_->slotWMHide(); e->accept(); } + + +void QERTDialog::change_adaptor() +{ + form_->changed(); +} diff --git a/src/frontends/qt2/QERTDialog.h b/src/frontends/qt2/QERTDialog.h index 326dca2430..70078da3a1 100644 --- a/src/frontends/qt2/QERTDialog.h +++ b/src/frontends/qt2/QERTDialog.h @@ -1,19 +1,25 @@ +// -*- C++ -*- /** * \file QERTDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QERTDIALOG_H #define QERTDIALOG_H -#include - -#include "QERT.h" #include "ui/QERTDialogBase.h" +#ifdef __GNUG__ +#pragma interface +#endif + +class QERT; + class QERTDialog : public QERTDialogBase { Q_OBJECT @@ -21,9 +27,7 @@ public: QERTDialog(QERT * form); protected slots: - void change_adaptor() { - form_->changed(); - } + virtual void change_adaptor(); protected: virtual void closeEvent(QCloseEvent * e); diff --git a/src/frontends/qt2/QError.C b/src/frontends/qt2/QError.C index d2cd908c40..5ada44dee9 100644 --- a/src/frontends/qt2/QError.C +++ b/src/frontends/qt2/QError.C @@ -1,13 +1,19 @@ /** * \file QError.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "ControlError.h" #include "gettext.h" diff --git a/src/frontends/qt2/QError.h b/src/frontends/qt2/QError.h index 1737a700ba..9187a72743 100644 --- a/src/frontends/qt2/QError.h +++ b/src/frontends/qt2/QError.h @@ -1,15 +1,21 @@ // -*- C++ -*- /** * \file QError.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QERROR_H #define QERROR_H +#ifdef __GNUG__ +#pragma interface +#endif + #include "Qt2Base.h" class ControlError; diff --git a/src/frontends/qt2/QErrorDialog.C b/src/frontends/qt2/QErrorDialog.C index 2b05b5207b..2fa04f6457 100644 --- a/src/frontends/qt2/QErrorDialog.C +++ b/src/frontends/qt2/QErrorDialog.C @@ -1,13 +1,19 @@ /** * \file QErrorDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "QError.h" #include diff --git a/src/frontends/qt2/QErrorDialog.h b/src/frontends/qt2/QErrorDialog.h index c93fb10b9f..012ee442d6 100644 --- a/src/frontends/qt2/QErrorDialog.h +++ b/src/frontends/qt2/QErrorDialog.h @@ -1,15 +1,20 @@ +// -*- C++ -*- /** * \file QErrorDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QERRORDIALOG_H #define QERRORDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "ui/QErrorDialogBase.h" diff --git a/src/frontends/qt2/QExternal.C b/src/frontends/qt2/QExternal.C index fe8c957699..5fa7eadfa3 100644 --- a/src/frontends/qt2/QExternal.C +++ b/src/frontends/qt2/QExternal.C @@ -1,12 +1,19 @@ /** * \file QExternal.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include #include "ControlExternal.h" diff --git a/src/frontends/qt2/QExternal.h b/src/frontends/qt2/QExternal.h index 1f900eb07c..7810952c4d 100644 --- a/src/frontends/qt2/QExternal.h +++ b/src/frontends/qt2/QExternal.h @@ -1,15 +1,21 @@ // -*- C++ -*- /** * \file QExternal.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QEXTERNAL_H #define QEXTERNAL_H +#ifdef __GNUG__ +#pragma interface +#endif + #include "Qt2Base.h" class ControlExternal; diff --git a/src/frontends/qt2/QExternalDialog.C b/src/frontends/qt2/QExternalDialog.C index 35f08ed57e..fab00475cc 100644 --- a/src/frontends/qt2/QExternalDialog.C +++ b/src/frontends/qt2/QExternalDialog.C @@ -1,13 +1,19 @@ /** * \file QExternalDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "gettext.h" #include "ControlExternal.h" diff --git a/src/frontends/qt2/QExternalDialog.h b/src/frontends/qt2/QExternalDialog.h index b1864db1d5..b698d26d91 100644 --- a/src/frontends/qt2/QExternalDialog.h +++ b/src/frontends/qt2/QExternalDialog.h @@ -1,15 +1,20 @@ +// -*- C++ -*- /** * \file QExternalDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QEXTERNALDIALOG_H #define QEXTERNALDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "ui/QExternalDialogBase.h" @@ -22,7 +27,7 @@ public: QExternalDialog(QExternal * form); virtual void show(); - + protected slots: virtual void change_adaptor(); virtual void editClicked(); diff --git a/src/frontends/qt2/QFloat.C b/src/frontends/qt2/QFloat.C index 6b26ac94bb..df8ba889f4 100644 --- a/src/frontends/qt2/QFloat.C +++ b/src/frontends/qt2/QFloat.C @@ -1,9 +1,11 @@ /** * \file QFloat.C - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Edwin Leuven + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QFloat.h b/src/frontends/qt2/QFloat.h index fbea747143..3bb8fc7ce6 100644 --- a/src/frontends/qt2/QFloat.h +++ b/src/frontends/qt2/QFloat.h @@ -1,10 +1,12 @@ // -*- C++ -*- /** * \file QFloat.h - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Edwin Leuven + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #ifndef QFLOAT_H diff --git a/src/frontends/qt2/QFloatDialog.C b/src/frontends/qt2/QFloatDialog.C index ce1220f3f8..c1af77b021 100644 --- a/src/frontends/qt2/QFloatDialog.C +++ b/src/frontends/qt2/QFloatDialog.C @@ -1,13 +1,19 @@ /** * \file QFloatDialog.C - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Edwin Leuven + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "LString.h" #include "ControlFloat.h" diff --git a/src/frontends/qt2/QFloatDialog.h b/src/frontends/qt2/QFloatDialog.h index 7b1ad62134..86f698f767 100644 --- a/src/frontends/qt2/QFloatDialog.h +++ b/src/frontends/qt2/QFloatDialog.h @@ -1,15 +1,20 @@ +// -*- C++ -*- /** * \file QFloatDialog.h - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Edwin Leuven + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #ifndef QFLOATDIALOG_H #define QFLOATDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "ui/QFloatDialogBase.h" @@ -26,7 +31,7 @@ protected slots: virtual void tbhpClicked(); virtual void heredefinitelyClicked(); virtual void spanClicked(); - + protected: virtual void closeEvent(QCloseEvent * e); diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C index 395bb3bd22..8a615bbeb7 100644 --- a/src/frontends/qt2/QGraphics.C +++ b/src/frontends/qt2/QGraphics.C @@ -1,10 +1,12 @@ /** * \file QGraphics.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon - * \author Edwin Leuven + * \author John Levon + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QGraphics.h b/src/frontends/qt2/QGraphics.h index 92eee3e586..0e3a4a15da 100644 --- a/src/frontends/qt2/QGraphics.h +++ b/src/frontends/qt2/QGraphics.h @@ -1,10 +1,12 @@ // -*- C++ -*- /** * \file QGraphics.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QGRAPHICS_H diff --git a/src/frontends/qt2/QGraphicsDialog.C b/src/frontends/qt2/QGraphicsDialog.C index 190442cd63..695aeb0066 100644 --- a/src/frontends/qt2/QGraphicsDialog.C +++ b/src/frontends/qt2/QGraphicsDialog.C @@ -1,12 +1,19 @@ /** * \file QGraphicsDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include #include "ControlGraphics.h" diff --git a/src/frontends/qt2/QGraphicsDialog.h b/src/frontends/qt2/QGraphicsDialog.h index b8e949d998..520a5d0e83 100644 --- a/src/frontends/qt2/QGraphicsDialog.h +++ b/src/frontends/qt2/QGraphicsDialog.h @@ -1,15 +1,20 @@ +// -*- C++ -*- /** * \file QGraphicsDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QGRAPHICSDIALOG_H #define QGRAPHICSDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "ui/QGraphicsDialogBase.h" @@ -22,7 +27,7 @@ public: QGraphicsDialog(QGraphics * form); virtual void show(); - + protected slots: virtual void change_adaptor(); virtual void browse_clicked(); diff --git a/src/frontends/qt2/QInclude.C b/src/frontends/qt2/QInclude.C index e0bcbccf01..a71ffdc6df 100644 --- a/src/frontends/qt2/QInclude.C +++ b/src/frontends/qt2/QInclude.C @@ -1,9 +1,11 @@ /** * \file QInclude.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QInclude.h b/src/frontends/qt2/QInclude.h index b1cb7941a3..22458cc3d8 100644 --- a/src/frontends/qt2/QInclude.h +++ b/src/frontends/qt2/QInclude.h @@ -1,10 +1,12 @@ // -*- C++ -*- /** * \file QInclude.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QINCLUDE_H diff --git a/src/frontends/qt2/QIncludeDialog.C b/src/frontends/qt2/QIncludeDialog.C index 05e59ba9e4..88ac175225 100644 --- a/src/frontends/qt2/QIncludeDialog.C +++ b/src/frontends/qt2/QIncludeDialog.C @@ -1,12 +1,19 @@ /** * \file QIncludeDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include #include "ControlInclude.h" diff --git a/src/frontends/qt2/QIncludeDialog.h b/src/frontends/qt2/QIncludeDialog.h index 02a8e5deec..a704ab09c6 100644 --- a/src/frontends/qt2/QIncludeDialog.h +++ b/src/frontends/qt2/QIncludeDialog.h @@ -1,15 +1,20 @@ +// -*- C++ -*- /** * \file QIncludeDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QINCLUDEDIALOG_H #define QINCLUDEDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "ui/QIncludeDialogBase.h" @@ -24,7 +29,7 @@ public: void updateLists(); virtual void show(); - + protected slots: virtual void change_adaptor(); virtual void loadClicked(); diff --git a/src/frontends/qt2/QIndex.C b/src/frontends/qt2/QIndex.C index f1c39be96b..db885c9794 100644 --- a/src/frontends/qt2/QIndex.C +++ b/src/frontends/qt2/QIndex.C @@ -1,13 +1,19 @@ /** * \file QIndex.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "ControlIndex.h" #include "gettext.h" diff --git a/src/frontends/qt2/QIndex.h b/src/frontends/qt2/QIndex.h index ecd3885e99..e785bfd461 100644 --- a/src/frontends/qt2/QIndex.h +++ b/src/frontends/qt2/QIndex.h @@ -1,16 +1,22 @@ // -*- C++ -*- /** * \file QIndex.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon - * \author Kalle Dalheimer + * \author John Levon + * \author Kalle Dalheimer + * + * Full author contact details are available in file CREDITS */ #ifndef QINDEX_H #define QINDEX_H +#ifdef __GNUG__ +#pragma interface +#endif + #include "Qt2Base.h" class ControlIndex; diff --git a/src/frontends/qt2/QIndexDialog.C b/src/frontends/qt2/QIndexDialog.C index fc16285dfd..06ae362e2e 100644 --- a/src/frontends/qt2/QIndexDialog.C +++ b/src/frontends/qt2/QIndexDialog.C @@ -1,13 +1,19 @@ /** * \file QIndexDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "gettext.h" #include "QIndex.h" diff --git a/src/frontends/qt2/QIndexDialog.h b/src/frontends/qt2/QIndexDialog.h index f360262bbf..e78d0b61ea 100644 --- a/src/frontends/qt2/QIndexDialog.h +++ b/src/frontends/qt2/QIndexDialog.h @@ -1,15 +1,20 @@ +// -*- C++ -*- /** * \file QIndexDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QINDEXDIALOG_H #define QINDEXDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "ui/QIndexDialogBase.h" @@ -22,7 +27,7 @@ public: QIndexDialog(QIndex * form); virtual void show(); - + protected slots: virtual void change_adaptor(); diff --git a/src/frontends/qt2/QLImage.C b/src/frontends/qt2/QLImage.C index 9c5a0442f7..15577b4305 100644 --- a/src/frontends/qt2/QLImage.C +++ b/src/frontends/qt2/QLImage.C @@ -1,10 +1,12 @@ -/* +/** * \file QLImage.C - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Angus Leeming, a.leeming@ic.ac.uk - * \author John Levon + * \author Angus Leeming + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QLImage.h b/src/frontends/qt2/QLImage.h index ed324c44ed..16aad2453d 100644 --- a/src/frontends/qt2/QLImage.h +++ b/src/frontends/qt2/QLImage.h @@ -1,11 +1,13 @@ // -*- C++ -*- /** * \file QLImage.h - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Angus Leeming, a.leeming@ic.ac.uk - * \author John Levon + * \author Angus Leeming + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QLIMAGE_H @@ -16,9 +18,9 @@ #endif #include "graphics/GraphicsImage.h" - + #include - + namespace grfx { class QLImage : public Image @@ -43,10 +45,10 @@ public: /// Get the image height virtual unsigned int getHeight() const; - // FIXME - virtual bool isDrawable() const { return true; } - - /** + // FIXME + virtual bool isDrawable() const { return true; } + + /** * Load the image file into memory. * The process is asynchronous, so this method starts the loading. * When finished, the Image::finishedLoading signal is emitted. diff --git a/src/frontends/qt2/QLPainter.C b/src/frontends/qt2/QLPainter.C index 6df50cdce9..5056fedd4d 100644 --- a/src/frontends/qt2/QLPainter.C +++ b/src/frontends/qt2/QLPainter.C @@ -1,9 +1,11 @@ /** * \file QLPainter.C - * Copyright 1998-2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QLPainter.h b/src/frontends/qt2/QLPainter.h index 5b27f38ca7..2410f4d60a 100644 --- a/src/frontends/qt2/QLPainter.h +++ b/src/frontends/qt2/QLPainter.h @@ -1,10 +1,12 @@ // -*- C++ -*- /** * \file QLPainter.h - * Copyright 1995-2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QLPAINTER_H @@ -14,13 +16,12 @@ #pragma interface #endif -#include -#include - #include "Painter.h" #include "LString.h" #include "LColor.h" +#include + class LyXFont; class QWorkArea; class QPainter; @@ -31,13 +32,13 @@ class QPainter; class QLPainter : public Painter { public: QLPainter(QWorkArea &); - + /// begin painting virtual void start(); /// end painting virtual void end(); - + /// return the width of the work area in pixels virtual int paperWidth() const; /// return the height of the work area in pixels @@ -45,7 +46,7 @@ public: /// draw a line from point to point virtual Painter & line( - int x1, int y1, + int x1, int y1, int x2, int y2, LColor::color = LColor::foreground, line_style = line_solid, @@ -58,8 +59,8 @@ public: * @param np size of the points array */ virtual Painter & lines( - int const * xp, - int const * yp, + int const * xp, + int const * yp, int np, LColor::color = LColor::foreground, line_style = line_solid, @@ -72,37 +73,37 @@ public: LColor::color = LColor::foreground, line_style = line_solid, line_width = line_thin); - + /// draw a filled rectangle virtual Painter & fillRectangle( int x, int y, int w, int h, LColor::color); - + /// draw a filled (irregular) polygon virtual Painter & fillPolygon( - int const * xp, - int const * yp, + int const * xp, + int const * yp, int np, - LColor::color = LColor::foreground); - + LColor::color = LColor::foreground); + /// draw an arc virtual Painter & arc( int x, int y, unsigned int w, unsigned int h, int a1, int a2, LColor::color = LColor::foreground); - + /// draw a pixel virtual Painter & point( int x, int y, LColor::color = LColor::foreground); - + /// draw an image from the image cache virtual Painter & image(int x, int y, int w, int h, grfx::Image const & image); - + /// draw a string at position x, y (y is the baseline) virtual Painter & text(int x, int y, string const & str, LyXFont const & f); @@ -125,16 +126,16 @@ private: LyXFont const & f); /// set pen parameters - QPainter & setPen(LColor::color c, + QPainter & setPen(LColor::color c, line_style ls = line_solid, line_width lw = line_thin); - + /// our owner who we paint upon QWorkArea & owner_; /// our qt painter boost::scoped_ptr qp_; - + /// recursion check int paint_check_; }; diff --git a/src/frontends/qt2/QLPopupMenu.C b/src/frontends/qt2/QLPopupMenu.C index 02b94bfa11..4f99d1d44d 100644 --- a/src/frontends/qt2/QLPopupMenu.C +++ b/src/frontends/qt2/QLPopupMenu.C @@ -1,11 +1,19 @@ /** * \file QLPopupMenu.h - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ +#include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include "MenuBackend.h" #include "lyxfunc.h" #include "debug.h" diff --git a/src/frontends/qt2/QLPopupMenu.h b/src/frontends/qt2/QLPopupMenu.h index c8fd3e2e7a..3a0726f957 100644 --- a/src/frontends/qt2/QLPopupMenu.h +++ b/src/frontends/qt2/QLPopupMenu.h @@ -1,20 +1,27 @@ +// -*- C++ -*- /** * \file QLPopupMenu.h - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QLPOPUPMENU_H #define QLPOPUPMENU_H - + +#ifdef __GNUG__ +#pragma interface +#endif + #include "Menubar_pimpl.h" - -#include + +#include #include "LString.h" - + class MenuBackend; class MenuItem; class Menu; @@ -24,14 +31,14 @@ class QLPopupMenu; /// create a sub-menu std::pair createMenu(QMenuData * parent, MenuItem const * item, Menubar::Pimpl * owner, bool is_toplevel = false); - + /// a submenu class QLPopupMenu : public QPopupMenu { Q_OBJECT public: QLPopupMenu(Menubar::Pimpl * owner, string const & name, bool toplevel); - /// populate the menu + /// populate the menu void populate(Menu * menu); public slots: @@ -41,7 +48,7 @@ public slots: private: /// return true if the given submenu is disabled bool disabled(Menu * menu); - + /// our owning menubar Menubar::Pimpl * owner_; diff --git a/src/frontends/qt2/QLog.C b/src/frontends/qt2/QLog.C index 6d6a53b461..535ce1bf3d 100644 --- a/src/frontends/qt2/QLog.C +++ b/src/frontends/qt2/QLog.C @@ -1,9 +1,11 @@ /** * \file QLog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QLog.h b/src/frontends/qt2/QLog.h index 1f971c4344..20bc00f433 100644 --- a/src/frontends/qt2/QLog.h +++ b/src/frontends/qt2/QLog.h @@ -1,10 +1,12 @@ // -*- C++ -*- /** * \file QLog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QLOG_H diff --git a/src/frontends/qt2/QLogDialog.C b/src/frontends/qt2/QLogDialog.C index 43cf6b3f3f..8f72a76ee2 100644 --- a/src/frontends/qt2/QLogDialog.C +++ b/src/frontends/qt2/QLogDialog.C @@ -1,12 +1,19 @@ /** * \file QLogDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include #include "LyXView.h" diff --git a/src/frontends/qt2/QLogDialog.h b/src/frontends/qt2/QLogDialog.h index b670c5ae50..e5483990c6 100644 --- a/src/frontends/qt2/QLogDialog.h +++ b/src/frontends/qt2/QLogDialog.h @@ -1,15 +1,20 @@ +// -*- C++ -*- /** * \file QLogDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QLOGDIALOG_H #define QLOGDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "ui/QLogDialogBase.h" diff --git a/src/frontends/qt2/QLyXKeySym.C b/src/frontends/qt2/QLyXKeySym.C index 82f0fb070e..042da02ce9 100644 --- a/src/frontends/qt2/QLyXKeySym.C +++ b/src/frontends/qt2/QLyXKeySym.C @@ -1,10 +1,12 @@ /** * \file QLyXKeySym.C - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author Asger and Juergen - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QLyXKeySym.h b/src/frontends/qt2/QLyXKeySym.h index da3f6d0583..76355de577 100644 --- a/src/frontends/qt2/QLyXKeySym.h +++ b/src/frontends/qt2/QLyXKeySym.h @@ -1,11 +1,13 @@ // -*- C++ -*- /** * \file QLyXKeySym.h - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author Asger and Juergen - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QLYXKEYSYM_H @@ -21,7 +23,7 @@ #include class QKeyEvent; - + /** * Qt-specific key press. * @@ -44,7 +46,7 @@ public: /// Is this a modifier key only? virtual bool isModifier() const; - + /// return the LyX symbolic name virtual string getSymbolName() const; @@ -60,7 +62,7 @@ public: private: /// the Qt sym value int key_; - /// the event string value + /// the event string value QString text_; }; diff --git a/src/frontends/qt2/QMath.C b/src/frontends/qt2/QMath.C index 89e85de6d4..b0b2346848 100644 --- a/src/frontends/qt2/QMath.C +++ b/src/frontends/qt2/QMath.C @@ -1,9 +1,11 @@ /** * \file QMath.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QMath.h b/src/frontends/qt2/QMath.h index 9a0c43f66a..0856de3765 100644 --- a/src/frontends/qt2/QMath.h +++ b/src/frontends/qt2/QMath.h @@ -1,23 +1,23 @@ // -*- C++ -*- /** * \file QMath.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QMATH_H #define QMATH_H -#include - -#include "LString.h" - #ifdef __GNUG__ #pragma interface #endif +#include "LString.h" + class QMathDialog; class QMath @@ -29,39 +29,39 @@ public: /// temporary void do_show(); - + /// build the dialog (should be private) virtual void build_dialog(); /// insert a math symbol into the doc void insert(string const & name); - + /// insert a cube root void insertCubeRoot(); - + /// insert a matrix void insertMatrix(); - + /// insert delim void insertDelim(string const & str); - + /// add a subscript void subscript(); /// add a superscript void superscript(); - + /// switch between display and inline void toggleDisplay(); - + private: /// Apply changes virtual void apply() {} /// update virtual void update_contents() {} - // FIXME: temp - QMathDialog * dialog_; + // FIXME: temp + QMathDialog * dialog_; }; #endif // QMATH_H diff --git a/src/frontends/qt2/QMathDialog.C b/src/frontends/qt2/QMathDialog.C index 699939b377..26f4e75a47 100644 --- a/src/frontends/qt2/QMathDialog.C +++ b/src/frontends/qt2/QMathDialog.C @@ -1,13 +1,19 @@ /** * \file QMathDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "support/filetools.h" #include "gettext.h" #include "debug.h" diff --git a/src/frontends/qt2/QMathDialog.h b/src/frontends/qt2/QMathDialog.h index e8b988dbdf..72e1753ec0 100644 --- a/src/frontends/qt2/QMathDialog.h +++ b/src/frontends/qt2/QMathDialog.h @@ -1,19 +1,23 @@ +// -*- C++ -*- /** * \file QMathDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QMATHDIALOG_H #define QMATHDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif -#include "LString.h" - #include "ui/QMathDialogBase.h" +#include "LString.h" class QMath; class IconPalette; @@ -42,7 +46,7 @@ public slots: /// about to show a symbol panel void showingPanel(int); - + protected: //needed ? virtual void closeEvent(QCloseEvent * e); @@ -52,7 +56,7 @@ private: /// add a symbol panel void addPanel(int num); - + /// owning form QMath * form_; }; diff --git a/src/frontends/qt2/QMinipage.C b/src/frontends/qt2/QMinipage.C index dfa93c7793..70631991b7 100644 --- a/src/frontends/qt2/QMinipage.C +++ b/src/frontends/qt2/QMinipage.C @@ -1,9 +1,11 @@ /** * \file QMinipage.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QMinipage.h b/src/frontends/qt2/QMinipage.h index e36e2d594d..6684d7c413 100644 --- a/src/frontends/qt2/QMinipage.h +++ b/src/frontends/qt2/QMinipage.h @@ -1,10 +1,12 @@ // -*- C++ -*- /** * \file QMinipage.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QMINIPAGE_H diff --git a/src/frontends/qt2/QMinipageDialog.C b/src/frontends/qt2/QMinipageDialog.C index 6e82a80fac..626fa0e39b 100644 --- a/src/frontends/qt2/QMinipageDialog.C +++ b/src/frontends/qt2/QMinipageDialog.C @@ -1,12 +1,19 @@ /** * \file QMinipageDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include #include "ControlMinipage.h" diff --git a/src/frontends/qt2/QMinipageDialog.h b/src/frontends/qt2/QMinipageDialog.h index 3e2dc07751..abe7111b91 100644 --- a/src/frontends/qt2/QMinipageDialog.h +++ b/src/frontends/qt2/QMinipageDialog.h @@ -1,15 +1,20 @@ +// -*- C++ -*- /** * \file QMinipageDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QMINIPAGEDIALOG_H #define QMINIPAGEDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "ui/QMinipageDialogBase.h" diff --git a/src/frontends/qt2/QParagraph.C b/src/frontends/qt2/QParagraph.C index d859e21bcf..49850a40b0 100644 --- a/src/frontends/qt2/QParagraph.C +++ b/src/frontends/qt2/QParagraph.C @@ -1,9 +1,11 @@ /** * \file QParagraph.C - * Copyright 2000-2001 The LyX Team. - * See the file COPYING. + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Edwin Leuven + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QParagraph.h b/src/frontends/qt2/QParagraph.h index 2c5d5cd996..30e789b60d 100644 --- a/src/frontends/qt2/QParagraph.h +++ b/src/frontends/qt2/QParagraph.h @@ -1,18 +1,24 @@ // -*- C++ -*- /** * \file QParagraph.h - * Copyright 2001 LyX Team - * see the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Edwin Leuven - * \author John Levon + * \author Edwin Leuven + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QPARAGRAPH_H #define QPARAGRAPH_H -#include +#ifdef __GNUG__ +#pragma interface +#endif + #include "Qt2Base.h" +#include class ControlParagraph; class QParagraphDialog; @@ -33,7 +39,7 @@ private: virtual void update_contents(); /// build the dialog virtual void build_dialog(); - + std::vector units_; }; diff --git a/src/frontends/qt2/QParagraphDialog.C b/src/frontends/qt2/QParagraphDialog.C index 7e59952b52..3778ad23b4 100644 --- a/src/frontends/qt2/QParagraphDialog.C +++ b/src/frontends/qt2/QParagraphDialog.C @@ -1,13 +1,23 @@ /** * \file QParagraphDialog.C * Copyright 2001 LyX Team - * see the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon, moz@compsoc.man.ac.uk - * \author Edwin Leuven, leuven@fee.uva.nl + * \author John Levon + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ +#include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include "QParagraphDialog.h" +#include "QParagraph.h" #include #include @@ -28,10 +38,10 @@ QParagraphDialog::QParagraphDialog(QParagraph * form) form_, SLOT(slotApply())); connect(closePB, SIGNAL(clicked()), form_, SLOT(slotClose())); - + linespacingValue->setValidator(new QDoubleValidator(linespacingValue)); - // disabled to allow glue spacing for latexperts + // disabled to allow glue spacing for latexperts //valueAbove->setValidator(new QDoubleValidator(valueAbove)); //valueBelow->setValidator(new QDoubleValidator(valueBelow)); } @@ -53,7 +63,7 @@ void QParagraphDialog::enableAbove(int) bool const enable = spacingAbove->currentItem()==6; valueAbove->setEnabled(enable); unitAbove->setEnabled(enable); - + } void QParagraphDialog::enableBelow(int) diff --git a/src/frontends/qt2/QParagraphDialog.h b/src/frontends/qt2/QParagraphDialog.h index e972b8d269..cb8924d988 100644 --- a/src/frontends/qt2/QParagraphDialog.h +++ b/src/frontends/qt2/QParagraphDialog.h @@ -1,22 +1,25 @@ // -*- C++ -*- /** * \file QParagraphDialog.h - * Copyright 2001 LyX Team - * see the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon, moz@compsoc.man.ac.uk - * \author Edwin Leuven, leuven@fee.uva.nl + * \author John Levon + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #ifndef QPARAGRAPHDIALOG_H #define QPARAGRAPHDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif -#include "QParagraph.h" #include "ui/QParagraphDialogBase.h" -#include +class QParagraph; class QParagraphDialog : public QParagraphDialogBase { @@ -28,7 +31,7 @@ protected: void closeEvent (QCloseEvent * e); private: QParagraph * form_; - + protected slots: void change_adaptor(); void enableAbove(int); diff --git a/src/frontends/qt2/QPreamble.C b/src/frontends/qt2/QPreamble.C index e9d15963a6..66af4aff42 100644 --- a/src/frontends/qt2/QPreamble.C +++ b/src/frontends/qt2/QPreamble.C @@ -1,9 +1,11 @@ /** * \file QPreamble.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QPreamble.h b/src/frontends/qt2/QPreamble.h index b0f57be281..30257b757d 100644 --- a/src/frontends/qt2/QPreamble.h +++ b/src/frontends/qt2/QPreamble.h @@ -1,10 +1,12 @@ // -*- C++ -*- /** * \file QPreamble.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QPREAMBLE_H diff --git a/src/frontends/qt2/QPreambleDialog.C b/src/frontends/qt2/QPreambleDialog.C index d2fb4965aa..e1eda7b596 100644 --- a/src/frontends/qt2/QPreambleDialog.C +++ b/src/frontends/qt2/QPreambleDialog.C @@ -1,12 +1,19 @@ /** * \file QPreambleDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include #include "support/lyxlib.h" diff --git a/src/frontends/qt2/QPreambleDialog.h b/src/frontends/qt2/QPreambleDialog.h index a44a6dbb2a..0e6e078dfc 100644 --- a/src/frontends/qt2/QPreambleDialog.h +++ b/src/frontends/qt2/QPreambleDialog.h @@ -1,15 +1,20 @@ +// -*- C++ -*- /** * \file QPreambleDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QPreambleDIAPreamble_H #define QPreambleDIAPreamble_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "ui/QPreambleDialogBase.h" diff --git a/src/frontends/qt2/QPrint.C b/src/frontends/qt2/QPrint.C index 2bb4f578f6..4a1b030a56 100644 --- a/src/frontends/qt2/QPrint.C +++ b/src/frontends/qt2/QPrint.C @@ -1,10 +1,12 @@ /** * \file QPrint.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon - * \author Edwin Leuven, leuven@fee.uva.nl + * \author John Levon + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #include @@ -14,6 +16,7 @@ #endif #include "LyXView.h" +#include "PrinterParams.h" #include "ControlPrint.h" #include "support/lstrings.h" #include "gettext.h" diff --git a/src/frontends/qt2/QPrint.h b/src/frontends/qt2/QPrint.h index be9de9ecf0..cb8e5149cf 100644 --- a/src/frontends/qt2/QPrint.h +++ b/src/frontends/qt2/QPrint.h @@ -1,11 +1,13 @@ // -*- C++ -*- /** * \file QPrint.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon - * \author Edwin Leuven, leuven@fee.uva.nl + * \author John Levon + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #ifndef QPRINT_H @@ -19,7 +21,6 @@ class ControlPrint; class QPrintDialog; -class Dialogs; /// class QPrint diff --git a/src/frontends/qt2/QPrintDialog.C b/src/frontends/qt2/QPrintDialog.C index ecce8ac3fb..ff47599ad6 100644 --- a/src/frontends/qt2/QPrintDialog.C +++ b/src/frontends/qt2/QPrintDialog.C @@ -1,14 +1,21 @@ /** * \file QPrintDialog.C * Copyright 2001 LyX Team - * see the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon, moz@compsoc.man.ac.uk - * \author Edwin Leuven, leuven@fee.uva.nl + * \author John Levon + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #include - + +#ifdef __GNUG__ +#pragma implementation +#endif + #include #include "support/filetools.h" #include "support/lstrings.h" @@ -34,7 +41,7 @@ QPrintDialog::QPrintDialog(QPrint * f) form_, SLOT(slotClose())); } - + void QPrintDialog::change_adaptor() { form_->changed(); diff --git a/src/frontends/qt2/QPrintDialog.h b/src/frontends/qt2/QPrintDialog.h index 46dd720a06..595badac73 100644 --- a/src/frontends/qt2/QPrintDialog.h +++ b/src/frontends/qt2/QPrintDialog.h @@ -1,20 +1,23 @@ +// -*- C++ -*- /** * \file QPrintDialog.h - * Copyright 2001 LyX Team - * see the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon, moz@compsoc.man.ac.uk - * \author Edwin Leuven, leuven@fee.uva.nl + * \author John Levon + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #ifndef QPRINTDIALOG_H #define QPRINTDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "ui/QPrintDialogBase.h" -#include "lyxrc.h" -#include "PrinterParams.h" class QPrint; @@ -34,7 +37,6 @@ protected slots: private: QPrint * form_; - }; #endif // QPRINTDIALOG_H diff --git a/src/frontends/qt2/QRef.C b/src/frontends/qt2/QRef.C index e287509ccb..52028535eb 100644 --- a/src/frontends/qt2/QRef.C +++ b/src/frontends/qt2/QRef.C @@ -1,13 +1,19 @@ /** * \file QRef.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "ControlRef.h" #include "QRef.h" #include "QRefDialog.h" diff --git a/src/frontends/qt2/QRef.h b/src/frontends/qt2/QRef.h index ff40a27664..093feab24b 100644 --- a/src/frontends/qt2/QRef.h +++ b/src/frontends/qt2/QRef.h @@ -1,19 +1,24 @@ +// -*- C++ -*- /** * \file QRef.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QREF_H #define QREF_H -#include -#include -#include "LString.h" +#ifdef __GNUG__ +#pragma interface +#endif #include "Qt2Base.h" +#include +#include "LString.h" class ControlRef; class QRefDialog; diff --git a/src/frontends/qt2/QRefDialog.C b/src/frontends/qt2/QRefDialog.C index c8f69a1f9a..c3ecea3b4e 100644 --- a/src/frontends/qt2/QRefDialog.C +++ b/src/frontends/qt2/QRefDialog.C @@ -1,14 +1,20 @@ /** * \file QRefDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Kalle Dalheimer - * \author John Levon + * \author Kalle Dalheimer + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "ControlRef.h" #include "debug.h" diff --git a/src/frontends/qt2/QRefDialog.h b/src/frontends/qt2/QRefDialog.h index 314879f1a6..0a1571c4f1 100644 --- a/src/frontends/qt2/QRefDialog.h +++ b/src/frontends/qt2/QRefDialog.h @@ -1,16 +1,21 @@ +// -*- C++ -*- /** * \file QRefDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Kalle Dalheimer - * \author John Levon + * \author Kalle Dalheimer + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QREFDIALOG_H #define QREFDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "ui/QRefDialogBase.h" diff --git a/src/frontends/qt2/QSearch.C b/src/frontends/qt2/QSearch.C index 75d96855bf..34a0d4ed96 100644 --- a/src/frontends/qt2/QSearch.C +++ b/src/frontends/qt2/QSearch.C @@ -1,9 +1,11 @@ /** * \file QSearch.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QSearch.h b/src/frontends/qt2/QSearch.h index 0ad702c8d4..5674d2258d 100644 --- a/src/frontends/qt2/QSearch.h +++ b/src/frontends/qt2/QSearch.h @@ -1,10 +1,12 @@ // -*- C++ -*- /** * \file QSearch.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QSEARCH_H diff --git a/src/frontends/qt2/QSearchDialog.C b/src/frontends/qt2/QSearchDialog.C index ff97c056c0..5586610bd6 100644 --- a/src/frontends/qt2/QSearchDialog.C +++ b/src/frontends/qt2/QSearchDialog.C @@ -1,15 +1,22 @@ /** * \file QSearchDialog.C - * Copyright 2001 The LyX Team. - * See the file COPYING. + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "ControlSearch.h" #include "QSearchDialog.h" +#include "QSearch.h" #include "debug.h" #include diff --git a/src/frontends/qt2/QSearchDialog.h b/src/frontends/qt2/QSearchDialog.h index 691a41ae71..1bbe6ae19b 100644 --- a/src/frontends/qt2/QSearchDialog.h +++ b/src/frontends/qt2/QSearchDialog.h @@ -1,19 +1,25 @@ +// -*- C++ -*- /** * \file QSearchDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #ifndef QSEARCHDIALOG_H #define QSEARCHDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif -#include "QSearch.h" #include "ui/QSearchDialogBase.h" +#include "LString.h" +class QSearch; class QCloseEvent; class QComboBox; @@ -39,7 +45,6 @@ private: void remember(string const & find, QComboBox & combo); QSearch * form_; - }; #endif // QSEARCHDIALOG_H diff --git a/src/frontends/qt2/QShowFile.C b/src/frontends/qt2/QShowFile.C index 1798cbfb23..e099ddc574 100644 --- a/src/frontends/qt2/QShowFile.C +++ b/src/frontends/qt2/QShowFile.C @@ -1,13 +1,19 @@ /** * \file QShowFile.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "ControlShowFile.h" #include "gettext.h" diff --git a/src/frontends/qt2/QShowFile.h b/src/frontends/qt2/QShowFile.h index c35676bf96..c0418bf2f2 100644 --- a/src/frontends/qt2/QShowFile.h +++ b/src/frontends/qt2/QShowFile.h @@ -1,15 +1,21 @@ // -*- C++ -*- /** * \file QShowFile.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QSHOWFILE_H #define QSHOWFILE_H +#ifdef __GNUG__ +#pragma interface +#endif + #include "Qt2Base.h" class ControlShowFile; diff --git a/src/frontends/qt2/QShowFileDialog.C b/src/frontends/qt2/QShowFileDialog.C index 7b41575257..1afcf24544 100644 --- a/src/frontends/qt2/QShowFileDialog.C +++ b/src/frontends/qt2/QShowFileDialog.C @@ -1,11 +1,19 @@ /** * \file QShowFileDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ +#include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include "QShowFile.h" #include "QShowFileDialog.h" diff --git a/src/frontends/qt2/QShowFileDialog.h b/src/frontends/qt2/QShowFileDialog.h index 1dd3311c44..df603ae215 100644 --- a/src/frontends/qt2/QShowFileDialog.h +++ b/src/frontends/qt2/QShowFileDialog.h @@ -1,15 +1,20 @@ +// -*- C++ -*- /** * \file QShowFileDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QSHOWFILEDIALOG_H #define QSHOWFILEDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "ui/QShowFileDialogBase.h" diff --git a/src/frontends/qt2/QSpellchecker.C b/src/frontends/qt2/QSpellchecker.C index 40cd60ddca..29d19cd0d8 100644 --- a/src/frontends/qt2/QSpellchecker.C +++ b/src/frontends/qt2/QSpellchecker.C @@ -1,13 +1,19 @@ /** * \file QSpellchecker.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "ControlSpellchecker.h" #include "QSpellcheckerDialog.h" #include "QSpellchecker.h" diff --git a/src/frontends/qt2/QSpellchecker.h b/src/frontends/qt2/QSpellchecker.h index edbfec7394..ba3466d888 100644 --- a/src/frontends/qt2/QSpellchecker.h +++ b/src/frontends/qt2/QSpellchecker.h @@ -1,18 +1,23 @@ // -*- C++ -*- /** * \file QSpellchecker.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon - * \author Kalle Dalheimer + * \author John Levon + * \author Kalle Dalheimer + * + * Full author contact details are available in file CREDITS */ #ifndef QSPELLCHECKER_H #define QSPELLCHECKER_H -#include "Qt2Base.h" +#ifdef __GNUG__ +#pragma interface +#endif +#include "Qt2Base.h" class ControlSpellchecker; class QSpellcheckerDialog; diff --git a/src/frontends/qt2/QSpellcheckerDialog.C b/src/frontends/qt2/QSpellcheckerDialog.C index 2b57640262..0e134b7d94 100644 --- a/src/frontends/qt2/QSpellcheckerDialog.C +++ b/src/frontends/qt2/QSpellcheckerDialog.C @@ -1,13 +1,19 @@ /** * \file QSpellcheckerDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "QSpellcheckerDialog.h" #include "QSpellchecker.h" #include "gettext.h" @@ -26,7 +32,43 @@ QSpellcheckerDialog::QSpellcheckerDialog(QSpellchecker * form) } -void QSpellcheckerDialog:: suggestionChanged(const QString & str) +void QSpellcheckerDialog::stop() +{ + form_->stop(); +} + + +void QSpellcheckerDialog::acceptClicked() +{ + form_->accept(); +} + + +void QSpellcheckerDialog::spellcheckClicked() +{ + form_->spellcheck(); +} + + +void QSpellcheckerDialog::addClicked() +{ + form_->add(); +} + + +void QSpellcheckerDialog::replaceClicked() +{ + form_->replace(); +} + + +void QSpellcheckerDialog::ignoreClicked() +{ + form_->ignore(); +} + + +void QSpellcheckerDialog::suggestionChanged(const QString & str) { if (replaceCO->count() != 0) replaceCO->changeItem(str, 0); @@ -37,7 +79,7 @@ void QSpellcheckerDialog:: suggestionChanged(const QString & str) } -void QSpellcheckerDialog:: replaceChanged(const QString & str) +void QSpellcheckerDialog::replaceChanged(const QString & str) { if (suggestionsLB->currentText() == str) return; diff --git a/src/frontends/qt2/QSpellcheckerDialog.h b/src/frontends/qt2/QSpellcheckerDialog.h index f53e42823e..08ffeae406 100644 --- a/src/frontends/qt2/QSpellcheckerDialog.h +++ b/src/frontends/qt2/QSpellcheckerDialog.h @@ -1,19 +1,25 @@ +// -*- C++ -*- /** * \file QSpellcheckerDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QSPELLCHECKERDIALOG_H #define QSPELLCHECKERDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif -#include "QSpellchecker.h" #include "ui/QSpellcheckerDialogBase.h" +class QSpellchecker; + class QSpellcheckerDialog : public QSpellcheckerDialogBase { Q_OBJECT @@ -21,25 +27,12 @@ public: QSpellcheckerDialog(QSpellchecker * form); protected slots: - virtual void stop() { - form_->stop(); - } - - virtual void acceptClicked() { - form_->accept(); - } - virtual void spellcheckClicked() { - form_->spellcheck(); - } - virtual void addClicked() { - form_->add(); - } - virtual void replaceClicked() { - form_->replace(); - } - virtual void ignoreClicked() { - form_->ignore(); - } + virtual void stop(); + virtual void acceptClicked(); + virtual void spellcheckClicked(); + virtual void addClicked(); + virtual void replaceClicked(); + virtual void ignoreClicked(); virtual void suggestionChanged(const QString &); virtual void replaceChanged(const QString &); diff --git a/src/frontends/qt2/QTabularCreate.C b/src/frontends/qt2/QTabularCreate.C index 6a72656e3f..5de46e3398 100644 --- a/src/frontends/qt2/QTabularCreate.C +++ b/src/frontends/qt2/QTabularCreate.C @@ -1,9 +1,11 @@ /** * \file QTabularCreate.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QTabularCreate.h b/src/frontends/qt2/QTabularCreate.h index 10a68c22bc..e4dbfa1ec5 100644 --- a/src/frontends/qt2/QTabularCreate.h +++ b/src/frontends/qt2/QTabularCreate.h @@ -1,10 +1,12 @@ // -*- C++ -*- /** * \file QTabularCreate.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QTABULARCREATE_H diff --git a/src/frontends/qt2/QTabularCreateDialog.C b/src/frontends/qt2/QTabularCreateDialog.C index 1b2b818bd4..4e9f0e27cb 100644 --- a/src/frontends/qt2/QTabularCreateDialog.C +++ b/src/frontends/qt2/QTabularCreateDialog.C @@ -1,13 +1,20 @@ /** * \file QTabularCreateDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon, moz@compsoc.man.ac.uk - * \author Edwin Leuven, leuven@fee.uva.nl + * \author John Levon + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include #include "support/lstrings.h" diff --git a/src/frontends/qt2/QTabularCreateDialog.h b/src/frontends/qt2/QTabularCreateDialog.h index eac2ee9842..0cf12397e6 100644 --- a/src/frontends/qt2/QTabularCreateDialog.h +++ b/src/frontends/qt2/QTabularCreateDialog.h @@ -1,15 +1,22 @@ +// -*- C++ -*- /** * \file QTabularCreateDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon - * \author Edwin Leuven + * \author John Levon + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #ifndef QTABULARCREATEDIALOG_H #define QTABULARCREATEDIALOG_H +#ifdef __GNUG__ +#pragma interface +#endif + #include "ui/QTabularCreateDialogBase.h" class QTabularCreate; diff --git a/src/frontends/qt2/QTexinfo.C b/src/frontends/qt2/QTexinfo.C index 5c2e006f73..776a4be3eb 100644 --- a/src/frontends/qt2/QTexinfo.C +++ b/src/frontends/qt2/QTexinfo.C @@ -1,9 +1,11 @@ /** * \file QTexinfo.C - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Edwin Leuven + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QTexinfo.h b/src/frontends/qt2/QTexinfo.h index 26e5cc8ecb..cadb749a7b 100644 --- a/src/frontends/qt2/QTexinfo.h +++ b/src/frontends/qt2/QTexinfo.h @@ -1,10 +1,12 @@ // -*- C++ -*- /** * \file QTexinfo.h - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Edwin Leuven + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #ifndef QTEXINFO_H diff --git a/src/frontends/qt2/QTexinfoDialog.C b/src/frontends/qt2/QTexinfoDialog.C index c8264eb7a4..bf6261c97b 100644 --- a/src/frontends/qt2/QTexinfoDialog.C +++ b/src/frontends/qt2/QTexinfoDialog.C @@ -1,12 +1,19 @@ /** * \file QTexinfoDialog.C - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Edwin Leuven + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include #include "LString.h" diff --git a/src/frontends/qt2/QTexinfoDialog.h b/src/frontends/qt2/QTexinfoDialog.h index 8d17518f0e..cd83bb7d1c 100644 --- a/src/frontends/qt2/QTexinfoDialog.h +++ b/src/frontends/qt2/QTexinfoDialog.h @@ -1,15 +1,20 @@ +// -*- C++ -*- /** * \file QTexinfoDialog.h - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Edwin Leuven + * \author Edwin Leuven + * + * Full author contact details are available in file CREDITS */ #ifndef QTEXINFODIALOG_H #define QTEXINFODIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "ui/QTexinfoDialogBase.h" diff --git a/src/frontends/qt2/QThesaurus.C b/src/frontends/qt2/QThesaurus.C index feaa237db4..4dd9a6ddfb 100644 --- a/src/frontends/qt2/QThesaurus.C +++ b/src/frontends/qt2/QThesaurus.C @@ -1,9 +1,11 @@ /** * \file QThesaurus.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QThesaurus.h b/src/frontends/qt2/QThesaurus.h index f47e5fb775..6a29a8b6d0 100644 --- a/src/frontends/qt2/QThesaurus.h +++ b/src/frontends/qt2/QThesaurus.h @@ -1,10 +1,12 @@ // -*- C++ -*- /** * \file QThesaurus.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QTHESAURUS_H diff --git a/src/frontends/qt2/QThesaurusDialog.C b/src/frontends/qt2/QThesaurusDialog.C index 2063d0a927..b90e9c0b88 100644 --- a/src/frontends/qt2/QThesaurusDialog.C +++ b/src/frontends/qt2/QThesaurusDialog.C @@ -1,12 +1,19 @@ /** * \file QThesaurusDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include #include "LString.h" diff --git a/src/frontends/qt2/QThesaurusDialog.h b/src/frontends/qt2/QThesaurusDialog.h index d2d89331eb..1bc413de5d 100644 --- a/src/frontends/qt2/QThesaurusDialog.h +++ b/src/frontends/qt2/QThesaurusDialog.h @@ -1,15 +1,20 @@ +// -*- C++ -*- /** * \file QThesaurusDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QTHESAURUSDIALOG_H #define QTHESAURUSDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "ui/QThesaurusDialogBase.h" diff --git a/src/frontends/qt2/QToc.C b/src/frontends/qt2/QToc.C index 7cb9c9e23d..bba3d3f1b6 100644 --- a/src/frontends/qt2/QToc.C +++ b/src/frontends/qt2/QToc.C @@ -1,9 +1,11 @@ /** * \file QToc.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include @@ -19,6 +21,7 @@ #include "support/lstrings.h" #include "debug.h" +#include "ControlToc.h" #include "QToc.h" #include "QTocDialog.h" #include "Qt2BC.h" diff --git a/src/frontends/qt2/QToc.h b/src/frontends/qt2/QToc.h index 520a0759d0..15e707cdfc 100644 --- a/src/frontends/qt2/QToc.h +++ b/src/frontends/qt2/QToc.h @@ -1,11 +1,13 @@ // -*- C++ -*- /** * \file QToc.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author John Levon - * \author Kalle Dalheimer + * \author Kalle Dalheimer + * + * Full author contact details are available in file CREDITS */ #ifndef QTOC_H @@ -15,10 +17,8 @@ #pragma interface #endif -#include "ControlToc.h" -#include "toc.h" - #include "Qt2Base.h" +#include "toc.h" class ControlToc; class QTocDialog; diff --git a/src/frontends/qt2/QTocDialog.C b/src/frontends/qt2/QTocDialog.C index 8b03ecea53..9db0e95276 100644 --- a/src/frontends/qt2/QTocDialog.C +++ b/src/frontends/qt2/QTocDialog.C @@ -1,13 +1,19 @@ /** * \file QTocDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "QToc.h" #include "QTocDialog.h" diff --git a/src/frontends/qt2/QTocDialog.h b/src/frontends/qt2/QTocDialog.h index 72187d2036..8f56262033 100644 --- a/src/frontends/qt2/QTocDialog.h +++ b/src/frontends/qt2/QTocDialog.h @@ -1,14 +1,21 @@ +// -*- C++ -*- /** * \file QTocDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QTOCDIALOG_H #define QTOCDIALOG_H +#ifdef __GNUG__ +#pragma interface +#endif + #include "ui/QTocDialogBase.h" class QToc; diff --git a/src/frontends/qt2/QURL.C b/src/frontends/qt2/QURL.C index cc5d1b4573..ad6a1c275b 100644 --- a/src/frontends/qt2/QURL.C +++ b/src/frontends/qt2/QURL.C @@ -1,13 +1,19 @@ /** * \file QURL.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "ControlUrl.h" #include "debug.h" #include "gettext.h" diff --git a/src/frontends/qt2/QURL.h b/src/frontends/qt2/QURL.h index 260ffd5de8..eb4bb341a5 100644 --- a/src/frontends/qt2/QURL.h +++ b/src/frontends/qt2/QURL.h @@ -1,14 +1,21 @@ +// -*- C++ -*- /** * \file QURL.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QURL_H #define QURL_H +#ifdef __GNUG__ +#pragma interface +#endif + #include "Qt2Base.h" class ControlUrl; diff --git a/src/frontends/qt2/QURLDialog.C b/src/frontends/qt2/QURLDialog.C index 178c7e2fff..0e9334f648 100644 --- a/src/frontends/qt2/QURLDialog.C +++ b/src/frontends/qt2/QURLDialog.C @@ -1,13 +1,19 @@ /** * \file QURLDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "QURL.h" #include "QURLDialog.h" diff --git a/src/frontends/qt2/QURLDialog.h b/src/frontends/qt2/QURLDialog.h index 518dea9cc7..f97c5e481e 100644 --- a/src/frontends/qt2/QURLDialog.h +++ b/src/frontends/qt2/QURLDialog.h @@ -1,14 +1,21 @@ +// -*- C++ -*- /** * \file QURLDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QURLDIALOG_H #define QURLDIALOG_H +#ifdef __GNUG__ +#pragma interface +#endif + #include "ui/QURLDialogBase.h" class QURL; @@ -21,7 +28,7 @@ public: ~QURLDialog(); virtual void show(); - + public slots: void changed_adaptor(); diff --git a/src/frontends/qt2/QVCLog.C b/src/frontends/qt2/QVCLog.C index da9273e43e..a7cad7ca10 100644 --- a/src/frontends/qt2/QVCLog.C +++ b/src/frontends/qt2/QVCLog.C @@ -1,9 +1,11 @@ /** * \file QVCLog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QVCLog.h b/src/frontends/qt2/QVCLog.h index fe59245fc1..070a106302 100644 --- a/src/frontends/qt2/QVCLog.h +++ b/src/frontends/qt2/QVCLog.h @@ -1,10 +1,12 @@ // -*- C++ -*- /** * \file QVCLog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QVCLOG_H diff --git a/src/frontends/qt2/QVCLogDialog.C b/src/frontends/qt2/QVCLogDialog.C index 3a2c206536..7f7bd8ac37 100644 --- a/src/frontends/qt2/QVCLogDialog.C +++ b/src/frontends/qt2/QVCLogDialog.C @@ -1,12 +1,19 @@ /** * \file QVCLogDialog.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include #include "LyXView.h" diff --git a/src/frontends/qt2/QVCLogDialog.h b/src/frontends/qt2/QVCLogDialog.h index 408e18a678..405d1ae3a5 100644 --- a/src/frontends/qt2/QVCLogDialog.h +++ b/src/frontends/qt2/QVCLogDialog.h @@ -1,15 +1,20 @@ +// -*- C++ -*- /** * \file QVCLogDialog.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QVCLOGDIALOG_H #define QVCLOGDIALOG_H -#include +#ifdef __GNUG__ +#pragma interface +#endif #include "ui/QVCLogDialogBase.h" diff --git a/src/frontends/qt2/QWorkArea.C b/src/frontends/qt2/QWorkArea.C index cb1aef11ec..6f23701f10 100644 --- a/src/frontends/qt2/QWorkArea.C +++ b/src/frontends/qt2/QWorkArea.C @@ -1,9 +1,11 @@ /** * \file QWorkArea.C - * Copyright 1995-2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QWorkArea.h b/src/frontends/qt2/QWorkArea.h index f991d358dc..900b5f7c6b 100644 --- a/src/frontends/qt2/QWorkArea.h +++ b/src/frontends/qt2/QWorkArea.h @@ -1,11 +1,13 @@ // -*- C++ -*- /** * \file QWorkArea.h - * Copyright 1995-2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author unknown - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QWORKAREA_H @@ -15,17 +17,15 @@ #pragma interface #endif -#include - #include "WorkArea.h" #include "QLPainter.h" #include "QContentPane.h" - + #include #include #include - + /** * Qt-specific implementation of the work area * (buffer view GUI) @@ -34,9 +34,9 @@ * Hopefully soon we can just use QScrollView ... */ class QWorkArea : public WorkArea, public QWidget { - + friend class QContentPane; - + public: QWorkArea(int x, int y, int w, int h); @@ -48,9 +48,9 @@ public: virtual int workWidth() const { return content_->width(); } /// return the height of the content pane virtual int workHeight() const { return content_->height(); } - /// + /// virtual void setScrollbarParams(int height, int pos, int line_height); - + /// a selection exists virtual void haveSelection(bool) const; /// @@ -69,9 +69,9 @@ private: QScrollBar * scrollbar_; /// content QContentPane * content_; - + /// our painter QLPainter painter_; }; - + #endif // QWORKAREA_H diff --git a/src/frontends/qt2/Qt2BC.C b/src/frontends/qt2/Qt2BC.C index 4ef0bc8153..83adf1e452 100644 --- a/src/frontends/qt2/Qt2BC.C +++ b/src/frontends/qt2/Qt2BC.C @@ -1,10 +1,12 @@ /** * \file Qt2BC.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Allan Rae - * \author Angus Leeming + * \author Allan Rae + * \author Angus Leeming + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/Qt2BC.h b/src/frontends/qt2/Qt2BC.h index 91709c7b85..9051fcbddd 100644 --- a/src/frontends/qt2/Qt2BC.h +++ b/src/frontends/qt2/Qt2BC.h @@ -1,12 +1,14 @@ // -*- C++ -*- /** * \file Qt2BC.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Allan Rae, rae@lyx.org - * \author Angus Leeming, a.leeming@ic.ac.uk - * \author Baruch Even, baruch.even@writeme.com + * \author Allan Rae + * \author Angus Leeming + * \author Baruch Even + * + * Full author contact details are available in file CREDITS */ #ifndef QT2BC_H diff --git a/src/frontends/qt2/Qt2Base.C b/src/frontends/qt2/Qt2Base.C index 7f2a95f250..424aa764ae 100644 --- a/src/frontends/qt2/Qt2Base.C +++ b/src/frontends/qt2/Qt2Base.C @@ -1,13 +1,11 @@ -/* This file is part of - * ====================================================== +/** + * \file Qt2Base.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * LyX, The Document Processor + * \author Angus Leeming * - * Copyright 2000 The LyX Team. - * - * ====================================================== - * - * \author Angus Leeming + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/Qt2Base.h b/src/frontends/qt2/Qt2Base.h index 3bea0caaef..e771848b7d 100644 --- a/src/frontends/qt2/Qt2Base.h +++ b/src/frontends/qt2/Qt2Base.h @@ -1,27 +1,22 @@ // -*- C++ -*- /** * \file Qt2Base.h - * Copyright 2000-2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Angus Leeming + * \author Angus Leeming + * + * Full author contact details are available in file CREDITS */ - #ifndef QT2BASE_H #define QT2BASE_H -#include - #ifdef __GNUG__ #pragma interface #endif #include "ViewBase.h" -#include "LString.h" -#include "debug.h" -#include "ButtonPolicies.h" - #include #include diff --git a/src/frontends/qt2/QtLyXView.h b/src/frontends/qt2/QtLyXView.h index 868ac1a42d..ae3d4efea9 100644 --- a/src/frontends/qt2/QtLyXView.h +++ b/src/frontends/qt2/QtLyXView.h @@ -1,8 +1,12 @@ // -*- C++ -*- -/* - * QtLyXView.h - * (C) 2000 LyX Team - * moz@compsoc.man.ac.uk +/** + * \file QtLyXView.h + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * \author John Levon + * + * Full author contact details are available in file CREDITS */ /* Qt has a messy namespace which conflicts with 'emit' in diff --git a/src/frontends/qt2/QtView.C b/src/frontends/qt2/QtView.C index e825c76b9b..90b4e0f704 100644 --- a/src/frontends/qt2/QtView.C +++ b/src/frontends/qt2/QtView.C @@ -1,10 +1,12 @@ /** * \file QtView.C - * Copyright 1995-2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjornes - * \author John Levon + * \author Lars Gullik Bjornes + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/QtView.h b/src/frontends/qt2/QtView.h index 8b07c4cb3f..69909fd617 100644 --- a/src/frontends/qt2/QtView.h +++ b/src/frontends/qt2/QtView.h @@ -1,11 +1,13 @@ // -*- C++ -*- /** * \file QtView.h - * Copyright 1995-2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjornes - * \author John Levon + * \author Lars Gullik Bjornes + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef QTVIEW_H @@ -15,15 +17,13 @@ #pragma interface #endif -#include - #include "frontends/LyXView.h" - + #include #include - + class QCommandBuffer; - + /** * QtView - Qt implementation of LyXView * @@ -36,7 +36,7 @@ public: QtView(unsigned int w, unsigned int h); ~QtView(); - + /** * show - display the top-level window * @param x x position @@ -44,34 +44,34 @@ public: * @param title window title */ void show(int x, int y, string const & t = string("LyX")); - + /// start modal operation virtual void prohibitInput() const; /// end modal operation virtual void allowInput() const; - + /// display a status message virtual void message(string const & str); - + public slots: /// menu item has been selected void activated(int id); - + /// idle timeout void update_view_state_qt(); - + protected: /// make sure we quit cleanly virtual void closeEvent(QCloseEvent * e); - + private: /// focus the command buffer widget void focus_command_widget(); /// update status bar void update_view_state(); - - /** + + /** * setWindowTitle - set title of window * @param t main window title * @param it iconified (short) title @@ -83,9 +83,9 @@ private: /// idle timer QTimer idle_timer_; - + /// command buffer QCommandBuffer * commandbuffer_; }; - + #endif // QTVIEW_H diff --git a/src/frontends/qt2/Timeout_pimpl.C b/src/frontends/qt2/Timeout_pimpl.C index 36843602e5..f7a226b753 100644 --- a/src/frontends/qt2/Timeout_pimpl.C +++ b/src/frontends/qt2/Timeout_pimpl.C @@ -1,9 +1,11 @@ /** * \file qt2/Timeout_pimpl.C - * Copyright 2001 LyX Team - * Read COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include diff --git a/src/frontends/qt2/Timeout_pimpl.h b/src/frontends/qt2/Timeout_pimpl.h index 7cf2477419..ad660ef2c9 100644 --- a/src/frontends/qt2/Timeout_pimpl.h +++ b/src/frontends/qt2/Timeout_pimpl.h @@ -1,24 +1,24 @@ // -*- C++ -*- /** * \file qt2/Timeout_pimpl.h - * Copyright 2001 LyX Team - * Read COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef TIMEOUTPIMPL_H #define TIMEOUTPIMPL_H -#include - #ifdef __GNUG__ #pragma interface #endif #include "frontends/Timeout.h" - #include + // stupid Qt #undef emit @@ -42,6 +42,7 @@ public: protected: /// slot virtual void timerEvent(QTimerEvent *); + private: /// the owning timer Timeout * owner_; diff --git a/src/frontends/qt2/Toolbar_pimpl.C b/src/frontends/qt2/Toolbar_pimpl.C index 94040ba69b..6e5fe7c955 100644 --- a/src/frontends/qt2/Toolbar_pimpl.C +++ b/src/frontends/qt2/Toolbar_pimpl.C @@ -1,9 +1,12 @@ /** * \file Toolbar_pimpl.C - * See the file COPYING. + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes, larsbj@lyx.org - * \uathor John Levon + * \author Lars Gullik Bjønnes + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include @@ -23,27 +26,27 @@ #include "support/LAssert.h" #include "support/filetools.h" -#include "support/lstrings.h" +#include "support/lstrings.h" #include "QtView.h" - + #include "Toolbar_pimpl.h" - + #include - + #include #include #include #include - + using std::endl; namespace { - + QPixmap getIconPixmap(int action) { FuncRequest f = lyxaction.retrieveActionArg(action); - + string xpm_name; if (f.action == LFUN_INSERT_MATH && !f.argument.empty()) { @@ -52,14 +55,14 @@ QPixmap getIconPixmap(int action) string const name = lyxaction.getActionName(f.action); if (!f.argument.empty()) xpm_name = subst(name + ' ' + f.argument, ' ','_'); - else + else xpm_name = name; } string fullname = LibFileSearch("images", xpm_name, "xpm"); if (!fullname.empty()) { - lyxerr[Debug::GUI] << "Full icon name is `" + lyxerr[Debug::GUI] << "Full icon name is `" << fullname << "'" << endl; return QPixmap(fullname.c_str()); } @@ -67,7 +70,7 @@ QPixmap getIconPixmap(int action) lyxerr << "Unable to find icon `" << xpm_name << "'" << endl; fullname = LibFileSearch("images", "unknown", "xpm"); if (!fullname.empty()) { - lyxerr[Debug::GUI] << "Using default `unknown' icon" + lyxerr[Debug::GUI] << "Using default `unknown' icon" << endl; } return QPixmap(fullname.c_str()); @@ -75,16 +78,16 @@ QPixmap getIconPixmap(int action) } // namespace anon - + class QLComboBox : public QComboBox { public: QLComboBox(QWidget * parent) : QComboBox(parent) {} void popup() { QComboBox::popup(); } }; - + Toolbar::Pimpl::Pimpl(LyXView * o, int, int) - : owner_(static_cast(o)), + : owner_(static_cast(o)), combo_(0) { proxy_.reset(new ToolbarProxy(*this)); @@ -100,14 +103,14 @@ void Toolbar::Pimpl::update() { ButtonMap::const_iterator p = map_.begin(); ButtonMap::const_iterator end = map_.end(); - + for (; p != end; ++p) { QToolButton * button = p->first; int action = p->second; - - FuncStatus const status = + + FuncStatus const status = owner_->getLyXFunc().getStatus(action); - + button->setToggleButton(true); button->setOn(status.onoff(true)); button->setEnabled(!status.disabled()); @@ -129,15 +132,15 @@ void Toolbar::Pimpl::button_selected(QToolButton * button) owner_->getLyXFunc().dispatch(cit->second, true); } - + void Toolbar::Pimpl::changed_layout(string const & sel) { owner_->centralWidget()->setFocus(); - + LyXTextClass const & tc = owner_->buffer()->params.getLyXTextClass(); - + LyXTextClass::const_iterator end = tc.end(); for (LyXTextClass::const_iterator cit = tc.begin(); cit != end; ++cit) { @@ -149,17 +152,17 @@ void Toolbar::Pimpl::changed_layout(string const & sel) lyxerr << "ERROR (Toolbar::Pimpl::layoutSelected): layout not found!" << endl; } - + void Toolbar::Pimpl::setLayout(string const & layout) { LyXTextClass const & tc = owner_->buffer()->params.getLyXTextClass(); - + string const & name = _(tc[layout]->name()); - + int i; - + for (i = 0; i < combo_->count(); ++i) { if (name == combo_->text(i).latin1()) break; @@ -177,17 +180,17 @@ void Toolbar::Pimpl::setLayout(string const & layout) void Toolbar::Pimpl::updateLayoutList(bool force) { - // if we don't need an update, don't ... + // if we don't need an update, don't ... if (combo_->count() && !force) return; - + LyXTextClass const & tc = owner_->buffer()->params.getLyXTextClass(); - - combo_->setUpdatesEnabled(false); - + + combo_->setUpdatesEnabled(false); + combo_->clear(); - + LyXTextClass::const_iterator cit = tc.begin(); LyXTextClass::const_iterator end = tc.end(); for (; cit != end; ++cit) { @@ -223,7 +226,7 @@ void Toolbar::Pimpl::add(int action) if (!toolbars_.size()) { toolbars_.push_back(new QToolBar(owner_)); } - + switch (action) { case ToolbarDefaults::SEPARATOR: toolbars_.back()->addSeparator(); @@ -237,13 +240,13 @@ void Toolbar::Pimpl::add(int action) combo_->setSizePolicy(p); combo_->setFocusPolicy(QWidget::ClickFocus); combo_->setMinimumWidth(combo_->sizeHint().width()); - + QObject::connect(combo_, SIGNAL(activated(const QString &)), proxy_.get(), SLOT(layout_selected(const QString &))); break; } default: { - QToolButton * tb = + QToolButton * tb = new QToolButton(getIconPixmap(action), _(lyxaction.helpText(action)).c_str(), "", proxy_.get(), SLOT(button_selected()), toolbars_.back()); diff --git a/src/frontends/qt2/Toolbar_pimpl.h b/src/frontends/qt2/Toolbar_pimpl.h index 6205ab6a67..59111055f6 100644 --- a/src/frontends/qt2/Toolbar_pimpl.h +++ b/src/frontends/qt2/Toolbar_pimpl.h @@ -1,45 +1,44 @@ // -*- C++ -*- /** * \file Toolbar_pimpl.h - * Copyright 2002 the LyX Team - * Copyright 1996-2001 Lars Gullik Bjønnes - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes, larsbj@lyx.org + * \author Lars Gullik Bjønnes + * + * Full author contact details are available in file CREDITS */ #ifndef TOOLBAR_PIMPL_H #define TOOLBAR_PIMPL_H -#include -#include -#include - -#include - -#include "frontends/Toolbar.h" - #ifdef __GNUG__ #pragma interface #endif +#include "frontends/Toolbar.h" + #include #include - + +#include +#include +#include + class QtView; class QToolBar; class QLComboBox; class ToolbarProxy; struct Toolbar::Pimpl { - + friend class ToolbarProxy; - + public: Pimpl(LyXView * o, int x, int y); ~Pimpl(); - + /// add a new button to the toolbar. void add(int action); @@ -59,8 +58,8 @@ private: void changed_layout(string const & sel); void button_selected(QToolButton * button); - - QtView * owner_; + + QtView * owner_; boost::scoped_ptr proxy_; @@ -71,10 +70,10 @@ private: typedef std::map ButtonMap; ButtonMap map_; - + }; - + // moc is mind-numbingly stupid class ToolbarProxy : public QObject { Q_OBJECT @@ -82,9 +81,9 @@ class ToolbarProxy : public QObject { public: ToolbarProxy(Toolbar::Pimpl & owner) : owner_(owner) { }; - + public slots: - + void layout_selected(const QString & str) { owner_.changed_layout(str.latin1()); } @@ -99,5 +98,5 @@ public slots: private: Toolbar::Pimpl & owner_; }; - + #endif diff --git a/src/frontends/qt2/WorkAreaFactory.C b/src/frontends/qt2/WorkAreaFactory.C index 5b4e9d6b86..f6aa6fa575 100644 --- a/src/frontends/qt2/WorkAreaFactory.C +++ b/src/frontends/qt2/WorkAreaFactory.C @@ -1,13 +1,19 @@ /** * \file WorkAreaFactory.C - * Copyright 2002 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * \author John Levon + * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "frontends/WorkAreaFactory.h" #include "QWorkArea.h" diff --git a/src/frontends/qt2/emptytable.C b/src/frontends/qt2/emptytable.C index c655dcf343..4c413129a9 100644 --- a/src/frontends/qt2/emptytable.C +++ b/src/frontends/qt2/emptytable.C @@ -1,11 +1,19 @@ /** * \file emptytable.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author John Levon + * + * Full author contact details are available in file CREDITS */ +#include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include "emptytable.h" /** diff --git a/src/frontends/qt2/emptytable.h b/src/frontends/qt2/emptytable.h index cb4d9024e8..1f18fd09e1 100644 --- a/src/frontends/qt2/emptytable.h +++ b/src/frontends/qt2/emptytable.h @@ -1,14 +1,21 @@ +// -*- C++ -*- /** * \file emptytable.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef EMPTYTABLE_H #define EMPTYTABLE_H +#ifdef __GNUG__ +#pragma interface +#endif + #include #include "qttableview.h" diff --git a/src/frontends/qt2/iconpalette.C b/src/frontends/qt2/iconpalette.C index 5136c2c33c..202ed6b686 100644 --- a/src/frontends/qt2/iconpalette.C +++ b/src/frontends/qt2/iconpalette.C @@ -1,13 +1,19 @@ /** * \file iconpalette.C - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author John Levon + * + * Full author contact details are available in file CREDITS */ #include +#ifdef __GNUG__ +#pragma implementation +#endif + #include "debug.h" #include "iconpalette.h" diff --git a/src/frontends/qt2/iconpalette.h b/src/frontends/qt2/iconpalette.h index 5fa1b5ee7e..d5cf47d2bc 100644 --- a/src/frontends/qt2/iconpalette.h +++ b/src/frontends/qt2/iconpalette.h @@ -1,22 +1,25 @@ +// -*- C++ -*- /** * \file iconpalette.h - * Copyright 2001 the LyX Team - * Read the file COPYING + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * * \author John Levon + * + * Full author contact details are available in file CREDITS */ #ifndef ICONPALETTE_H #define ICONPALETTE_H -#include +#ifdef __GNUG__ +#pragma interface +#endif -#include "LString.h" - #include - +#include "LString.h" +#include #include -#include class QPixmap; class QPushButton; @@ -38,17 +41,17 @@ signals: protected: virtual void resizeEvent(QResizeEvent * e); - + protected slots: virtual void clicked(); private: int maxcol_; - + QGridLayout * layout_; - + typedef std::pair Button; - + std::vector