[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kformula
From: Alfredo Beaumont Sainz <alfredo.beaumont () gmail ! com>
Date: 2007-05-14 15:33:35
Message-ID: 1179156815.032330.28915.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 664644 by abeaumont:
Change header file order, to make EBN's krazy happy
M +3 -3 flake/ActionElement.cpp
M +3 -3 flake/ErrorElement.cpp
M +2 -2 flake/OperatorElement.cpp
M +1 -1 flake/RowElement.cpp
M +9 -9 flake/StyleElement.cpp
M +2 -1 flake/TokenElement.cpp
M +3 -2 flake/TokenStyleElement.cpp
M +2 -1 flake/contextstyle.cc
M +3 -3 flake/fontstyle.cc
M +2 -1 flake/kformulaconfigpage.cc
M +7 -7 flake/symbolaction.cc
M +3 -2 flake/symboltable.cc
M +6 -5 formulastring.cc
M +2 -2 fsparser.cc
M +2 -1 kfconfig.cc
M +2 -1 kformulawidget.cc
--- trunk/koffice/kformula/flake/ActionElement.cpp #664643:664644
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
+#include "ActionElement.h"
#include "ElementFactory.h"
-#include "ActionElement.h"
namespace KFormula {
@@ -33,12 +33,12 @@
QString selectionStr = element.attribute( "selection" );
if ( ! selectionStr.isNull() ) {
bool ok;
- m_selection = selectionStr.toUInt( &ok );
+ m_selection = selectionStr.toUInt( &ok );
if ( ! ok ) m_selection = 0;
}
}
-int ActionElement::buildChildrenFromMathMLDom(QList<BasicElement*>& list, QDomNode \
n) +int ActionElement::buildChildrenFromMathMLDom(QList<BasicElement*>& list, \
QDomNode n) {
/*
if ( ! n.isElement() )
--- trunk/koffice/kformula/flake/ErrorElement.cpp #664643:664644
@@ -17,10 +17,10 @@
* Boston, MA 02110-1301, USA.
*/
+#include "ErrorElement.h"
+
#include <qpainter.h>
-#include "ErrorElement.h"
-
KFORMULA_NAMESPACE_BEGIN
ErrorElement::ErrorElement( BasicElement* parent ) : SequenceElement( parent ) {
@@ -47,5 +47,5 @@
context.getErrorColor() );
inherited::draw( painter, r, context, tstyle, istyle, style, parentOrigin );
}
-
+
KFORMULA_NAMESPACE_END
--- trunk/koffice/kformula/flake/OperatorElement.cpp #664643:664644
@@ -17,10 +17,10 @@
* Boston, MA 02110-1301, USA.
*/
+#include "OperatorElement.h"
+
#include <qpainter.h>
-#include "OperatorElement.h"
-
KFORMULA_NAMESPACE_BEGIN
OperatorElement::OperatorElement( BasicElement* parent ) : TokenElement( parent ),
--- trunk/koffice/kformula/flake/RowElement.cpp #664643:664644
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/
+#include "RowElement.h"
#include "kformuladefs.h"
-#include "RowElement.h"
#include "ElementFactory.h"
#include "FormulaCursor.h"
#include <kdebug.h>
--- trunk/koffice/kformula/flake/StyleElement.cpp #664643:664644
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "StyleElement.h"
#include "BasicElement.h"
-#include "StyleElement.h"
KFORMULA_NAMESPACE_BEGIN
@@ -45,7 +45,7 @@
if ( !BasicElement::readAttributesFromMathMLDom( element ) ) {
return false;
}
-
+
QString scriptlevelStr = element.attribute( "scriptlevel" );
if ( ! scriptlevelStr.isNull() ) {
if ( scriptlevelStr[0] == '+' || scriptlevelStr[0] == '-' ) {
@@ -54,7 +54,7 @@
bool ok;
m_scriptLevel = scriptlevelStr.toInt( &ok );
if ( ! ok ) {
- kWarning( DEBUGID ) << "Invalid scriptlevel attribute value: "
+ kWarning( DEBUGID ) << "Invalid scriptlevel attribute value: "
<< scriptlevelStr << endl;
}
else {
@@ -76,7 +76,7 @@
bool ok;
m_scriptSizeMultiplier = scriptsizemultiplierStr.toDouble( &ok );
if ( ! ok ) {
- kWarning( DEBUGID ) << "Invalid scriptsizemultiplier attribute value: "
+ kWarning( DEBUGID ) << "Invalid scriptsizemultiplier attribute value: "
<< scriptsizemultiplierStr << endl;
}
else {
@@ -193,7 +193,7 @@
style.setScriptSizeMultiplier( style.scriptSizeMultiplier() );
}
- // Get scriptminsize attribute in absolute units, so we don't depend on
+ // Get scriptminsize attribute in absolute units, so we don't depend on
// context to get the default value
double basesize = context.layoutUnitPtToPt( context.getBaseSize() );
double size = style.scriptMinSize();
@@ -209,7 +209,7 @@
}
style.setScriptMinSize( size );
- style.setVeryVeryThinMathSpace( sizeFactor( context,
+ style.setVeryVeryThinMathSpace( sizeFactor( context,
m_veryVeryThinMathSpaceType,
m_veryVeryThinMathSpace,
style.veryVeryThinMathSpace() ));
@@ -217,7 +217,7 @@
m_veryThinMathSpace,
style.veryThinMathSpace() ));
style.setThinMathSpace( sizeFactor( context, m_thinMathSpaceType,
- m_thinMathSpace,
+ m_thinMathSpace,
style.thinMathSpace() ));
style.setMediumMathSpace( sizeFactor( context, m_mediumMathSpaceType,
m_mediumMathSpace,
@@ -228,14 +228,14 @@
style.setVeryThickMathSpace( sizeFactor( context, m_veryThickMathSpaceType,
m_veryThickMathSpace,
style.veryThickMathSpace() ));
- style.setVeryVeryThickMathSpace( sizeFactor( context,
+ style.setVeryVeryThickMathSpace( sizeFactor( context,
m_veryVeryThickMathSpaceType,
m_veryVeryThickMathSpace,
style.veryVeryThickMathSpace() ));
inherited::setStyleSize( context, style );
}
-double StyleElement::sizeFactor( const ContextStyle& context, SizeType st,
+double StyleElement::sizeFactor( const ContextStyle& context, SizeType st,
double length, double defvalue )
{
double basesize = context.layoutUnitPtToPt( context.getBaseSize() );
--- trunk/koffice/kformula/flake/TokenElement.cpp #664643:664644
@@ -17,6 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "TokenElement.h"
+
#include <algorithm>
#include <qpainter.h>
@@ -26,7 +28,6 @@
#include "Entities.h"
#include "TextElement.h"
#include "GlyphElement.h"
-#include "TokenElement.h"
#include "FormulaElement.h"
#include "ElementFactory.h"
#include "AttributeManager.h"
--- trunk/koffice/kformula/flake/TokenStyleElement.cpp #664643:664644
@@ -17,12 +17,13 @@
* Boston, MA 02110-1301, USA.
*/
+#include "TokenStyleElement.h"
+
#include <qpainter.h>
#include <kdebug.h>
#include "BasicElement.h"
-#include "TokenStyleElement.h"
KFORMULA_NAMESPACE_BEGIN
@@ -38,7 +39,7 @@
QString colorname = colorStr.toLower();
- if ( colorname == "black" )
+ if ( colorname == "black" )
return "#000000";
if ( colorname == "silver" )
return "#C0C0C0";
--- trunk/koffice/kformula/flake/contextstyle.cc #664643:664644
@@ -19,6 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "contextstyle.h"
+
#include <QFontMetrics>
#include <QPaintDevice>
#include <QString>
@@ -27,7 +29,6 @@
#include <KoGlobal.h>
#include "fontstyle.h"
-#include "contextstyle.h"
KFORMULA_NAMESPACE_BEGIN
--- trunk/koffice/kformula/flake/fontstyle.cc #664643:664644
@@ -18,6 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "fontstyle.h"
+
#include <QPainter>
#include <QPen>
#include <QFontDatabase>
@@ -31,9 +33,7 @@
#include <kio/copyjob.h>
#include <kmessagebox.h>
-#include "fontstyle.h"
-
KFORMULA_NAMESPACE_BEGIN
#include "unicodetable.cc"
@@ -134,7 +134,7 @@
}
}
KIO::copy( urlList, KUrl( "fonts:/Personal/" ), false );
- KMessageBox::information(qApp->mainWidget(),
+ KMessageBox::information(qApp->mainWidget(),
i18n("Some fonts have been installed to assure that \
symbols in formulas are properly visualized. You must restart the application in \
order so that changes take effect")); }
m_installed = true;
--- trunk/koffice/kformula/flake/kformulaconfigpage.cc #664643:664644
@@ -18,6 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "kformulaconfigpage.h"
+
#include <QVariant> // first for gcc 2.7.2
#include <q3buttongroup.h>
#include <QCheckBox>
@@ -49,7 +51,6 @@
#include <kvbox.h>
#include "contextstyle.h"
-#include "kformulaconfigpage.h"
#include "symboltable.h"
--- trunk/koffice/kformula/flake/symbolaction.cc #664643:664644
@@ -17,6 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "symbolaction.h"
+
#include <q3listbox.h>
#include <QPainter>
#include <Q3ComboBox>
@@ -28,8 +30,6 @@
#include <kdebug.h>
#include <kauthorized.h>
-#include "symbolaction.h"
-
/*
* The items for the SymbolCombos. *
*/
@@ -118,7 +118,7 @@
if ( w->inherits( "KToolBar" ) )
{
#ifdef __GNUC__
-#warning "kde4: port it"
+#warning "kde4: port it"
#endif
#if 0
KToolBar* bar = static_cast<KToolBar*>( w );
@@ -142,7 +142,7 @@
}
else
w->addAction( this ); // possibly insertAction is needed
-
+
}
void SymbolAction::setSymbols( const QStringList &names, const QList<QFont>& fonts,
@@ -162,9 +162,9 @@
Q_UNUSED( id );
#ifdef __GNUC__
-#warning "kde4: port it"
+#warning "kde4: port it"
#endif
-#if 0
+#if 0
QWidget *w = container( id );
if ( w->inherits( "KToolBar" ) ) {
QWidget *r = static_cast<KToolBar*>( w )->getWidget( itemId( id ) );
@@ -179,7 +179,7 @@
cb->setMinimumWidth( cb->sizeHint().width() );
}
}
-#endif
+#endif
}
KFORMULA_NAMESPACE_END
--- trunk/koffice/kformula/flake/symboltable.cc #664643:664644
@@ -18,6 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "symboltable.h"
+
#include <QFile>
#include <QRegExp>
#include <QTextStream>
@@ -29,7 +31,6 @@
#include <klocale.h>
#include <kstandarddirs.h>
-#include "symboltable.h"
#include "contextstyle.h"
#include "unicodetable.cc"
@@ -47,7 +48,7 @@
}
QChar SymbolFontHelper::unicodeFromSymbolFont( QChar pos ) const
-{
+{
if ( compatibility.contains( pos ) ) {
return compatibility[ pos.toLatin1() ];
}
--- trunk/koffice/kformula/formulastring.cc #664643:664644
@@ -17,6 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "formulastring.h"
+
#include <QLabel>
#include <QStringList>
#include <QTextEdit>
@@ -33,7 +35,6 @@
#include <kpushbutton.h>
#include <ktoolinvocation.h>
-#include "formulastring.h"
#include "kformula_view.h"
@@ -46,7 +47,7 @@
setWindowTitle( i18n( "Formula String" ) );
setModal( modal );
setSizeGripEnabled( true );
-
+
m_widgetLayout = new QVBoxLayout( this );
m_buttonLayout = new QHBoxLayout( this );
m_textEdit = new QTextEdit( this );
@@ -54,12 +55,12 @@
m_btnHelp = new KPushButton( KStandardGuiItem::help(), this );
m_btnOk = new KPushButton( KStandardGuiItem::ok(), this );
m_btnCancel = new KPushButton( KStandardGuiItem::cancel(), this );
-
+
m_buttonLayout->addWidget( m_btnHelp );
m_buttonLayout->addSpacing( 100 );
m_buttonLayout->addWidget( m_btnOk );
m_buttonLayout->addWidget( m_btnCancel );
-
+
m_widgetLayout->addWidget( m_textEdit );
m_widgetLayout->addWidget( m_position );
m_widgetLayout->addLayout( m_buttonLayout );
@@ -114,7 +115,7 @@
void FormulaString::cursorPositionChanged()
{
-// m_textEdit->
+// m_textEdit->
// m_position->setText( QString( "%1:%2" ).arg( para+1 ).arg( pos+1 ) );
}
--- trunk/koffice/kformula/fsparser.cc #664643:664644
@@ -17,6 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "fsparser.h"
+
#include <q3ptrlist.h>
#include <kdebug.h>
@@ -26,9 +28,7 @@
#include <kformuladocument.h>
#include <symboltable.h>
-#include "fsparser.h"
-
using namespace std;
class ParserNode {
--- trunk/koffice/kformula/kfconfig.cc #664643:664644
@@ -18,13 +18,14 @@
* Boston, MA 02110-1301, USA.
*/
+#include "kfconfig.h"
+
#include <kdebug.h>
#include <kiconloader.h>
#include <kcomponentdata.h>
#include <klocale.h>
#include <kicon.h>
-#include "kfconfig.h"
#include "kformula_factory.h"
#include "kformula_doc.h"
#include "kformula_view.h"
--- trunk/koffice/kformula/kformulawidget.cc #664643:664644
@@ -18,6 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "kformulawidget.h"
+
#include <iostream>
#include <QPainter>
@@ -33,7 +35,6 @@
#include <formulaelement.h>
#include <kformulacontainer.h>
#include <kformuladocument.h>
-#include "kformulawidget.h"
KFormulaWidget::KFormulaWidget(KFormula::Container* doc,
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic