2 files changed, 14 insertions, 14 deletions

diff --git a/noncore/apps/opie-write/mainwindow.cpp b/noncore/apps/opie-write/mainwindow.cpp
index 6bb524f..90e1a70 100644
--- a/noncore/apps/opie-write/mainwindow.cpp
+++ b/noncore/apps/opie-write/mainwindow.cpp
@@ -30,345 +30,345 @@
 #include <qaction.h>
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <qtabwidget.h>
 #include <qapplication.h>
 #include <qfontdatabase.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qfileinfo.h>
 #include <qfile.h>
 #include <qfiledialog.h>
 #include <qprinter.h>
 #include <qpaintdevicemetrics.h>
 #include <qmenubar.h>
 #include <qpopupmenu.h>
 #include <qcolordialog.h>
 #include <qpainter.h>
 #include <qstyle.h>
 
 class ButtonMenu : public QToolButton
 {
     Q_OBJECT
 public:
     ButtonMenu( QWidget *parent, const char *name=0 )
   : QToolButton( parent, name ), current(0)
     {
   setPopup( new QPopupMenu( this ) );
   setPopupDelay( 1 );
   connect( popup(), SIGNAL(activated(int)), this, SLOT(selected(int)) );
     }
 
     int insertItem(const QIconSet &icon, const QString &text, int id ) {
   if ( !popup()->count() ) {
       setIconSet( icon );
       current = id;
   }
   return popup()->insertItem( icon, text, id );
     }
 
     void setCurrentItem( int id ) {
   if ( id != current ) {
       current = id;
       setIconSet( *popup()->iconSet( id ) );
   }
     }
 
     virtual QSize sizeHint() const {
   return QToolButton::sizeHint() + QSize( 4, 0 );
     }
 
 signals:
     void activated( int id );
 
 protected slots:
     void selected( int id ) {
   current = id;
   setIconSet( *popup()->iconSet( id ) );
   emit activated( id );
     }
 
 protected:
     virtual void drawButtonLabel( QPainter *p ) {
   p->translate( -4, 0 );
   QToolButton::drawButtonLabel( p );
   p->translate( 4, 0 );
     }
 
 private:
     int current;
 };
 
 //===========================================================================
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags fl  )
     : QMainWindow( parent, name, fl ),
       doc( 0 )
 {
     setRightJustification(TRUE);
 
     editorStack = new QWidgetStack( this );
 
     fileSelector = new FileSelector( "text/html",
              editorStack, "fileselector" );
 
 
     fileSelector->setCloseVisible( FALSE );
     editorStack->addWidget( fileSelector, 0 );
 
     editor = new Qt3::QTextEdit( editorStack );
     editor->setTextFormat( Qt::RichText );
     editorStack->addWidget( editor, 1 );
 
     setupActions();
 
     QObject::connect( fileSelector, SIGNAL(closeMe()),
           this, SLOT(showEditTools()) );
-    QObject::connect( fileSelector, SIGNAL(fileSelected(const DocLnk &)),
-          this, SLOT(openFile(const DocLnk &)) );
+    QObject::connect( fileSelector, SIGNAL(fileSelected(const DocLnk&)),
+          this, SLOT(openFile(const DocLnk&)) );
     QObject::connect( fileSelector, SIGNAL(newSelected(const DocLnk&)),
           this, SLOT(newFile(const DocLnk&)) );
 
     if ( fileSelector->fileCount() < 1 )
   fileNew();
     else {
   fileOpen();
     }
     doConnections( editor );
 
     setCentralWidget( editorStack );
 }
 
 MainWindow::~MainWindow()
 {
     save();
 }
 
 void MainWindow::setupActions()
 {
     setToolBarsMovable(false);
 
     tbMenu = new QToolBar( this );
     tbMenu->setHorizontalStretchable( TRUE );
 
     QMenuBar *menu = new QMenuBar( tbMenu );
 
     tbEdit = new QToolBar( this );
 
     QPopupMenu *file = new QPopupMenu( this );
     menu->insertItem( tr("File"), file );
 
     QPopupMenu *edit = new QPopupMenu( this );
     menu->insertItem( tr("Edit"), edit );
 
     // ### perhaps these shortcut keys should have some
     //     IPaq keys defined???
     QAction *a;
 
     a = new QAction( tr( "New" ), Resource::loadPixmap("new"), QString::null, 0, this, 0 );
     connect( a, SIGNAL(activated()), this, SLOT(fileNew()) );
     a->addTo( file );
 
     a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL(activated()), this, SLOT(fileOpen()) );
     a->addTo( file );
 
     a = new QAction( tr( "Undo" ), Resource::loadIconSet("undo"),
          QString::null, 0, this, "editUndo" );
     connect( a, SIGNAL( activated() ), this, SLOT( editUndo() ) );
     connect( editor, SIGNAL(undoAvailable(bool)), a, SLOT(setEnabled(bool)) );
     a->addTo( tbEdit );
     a->addTo( edit );
     a = new QAction( tr( "Redo" ), Resource::loadIconSet("redo"),
          QString::null, 0, this, "editRedo" );
     connect( a, SIGNAL( activated() ), this, SLOT( editRedo() ) );
     connect( editor, SIGNAL(redoAvailable(bool)), a, SLOT(setEnabled(bool)) );
     a->addTo( tbEdit );
     a->addTo( edit );
 
     edit->insertSeparator();
 
     a = new QAction( tr( "Copy" ), Resource::loadIconSet("copy"),
          QString::null, 0, this, "editCopy" );
     connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) );
     connect( editor, SIGNAL(copyAvailable(bool)), a, SLOT(setEnabled(bool)) );
     a->addTo( tbEdit );
     a->addTo( edit );
     a = new QAction( tr( "Cut" ), Resource::loadIconSet("cut"),
          QString::null, 0, this, "editCut" );
     connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );
     connect( editor, SIGNAL(copyAvailable(bool)), a, SLOT(setEnabled(bool)) );
     a->addTo( tbEdit );
     a->addTo( edit );
     a = new QAction( tr( "Paste" ), Resource::loadPixmap("paste"),
          QString::null, 0, this, "editPaste" );
     connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) );
     a->addTo( tbEdit );
     a->addTo( edit );
 
     tbFont = new QToolBar( this );
     tbFont->setLabel( "Font Actions" );
     tbFont->setHorizontalStretchable(TRUE);
 
     comboFont = new QComboBox( FALSE, tbFont );
     FontDatabase db;
     QStringList f= db.families();
     comboFont->insertStringList( db.families() );
-    connect( comboFont, SIGNAL( activated( const QString & ) ),
-       this, SLOT( textFamily( const QString & ) ) );
+    connect( comboFont, SIGNAL( activated(const QString&) ),
+       this, SLOT( textFamily(const QString&) ) );
     comboFont->setCurrentItem( comboFont->listBox()->index( comboFont->listBox()->findItem( QApplication::font().family() ) ) );
     comboFont->setMaximumWidth(90);
 
     comboSize = new QComboBox( TRUE, tbFont );
     QValueList<int> sizes = db.standardSizes();
     QValueList<int>::Iterator it = sizes.begin();
     for ( ; it != sizes.end(); ++it )
   comboSize->insertItem( QString::number( *it ) );
-    connect( comboSize, SIGNAL( activated( const QString & ) ),
-       this, SLOT( textSize( const QString & ) ) );
+    connect( comboSize, SIGNAL( activated(const QString&) ),
+       this, SLOT( textSize(const QString&) ) );
     comboSize->lineEdit()->setText( QString::number( QApplication::font().pointSize() ) );
     comboSize->setFixedWidth( 38 );
 
     tbStyle = new QToolBar( this );
     tbStyle->setLabel( "Style Actions" );
 
     actionTextBold = new QAction( tr( "Bold" ),
           Resource::loadPixmap("bold"),
           QString::null, CTRL + Key_B,
           this, "textBold" );
     connect( actionTextBold, SIGNAL( activated() ), this, SLOT( textBold() ) );
     actionTextBold->addTo( tbStyle );
     actionTextBold->setToggleAction( TRUE );
     actionTextItalic = new QAction( tr( "Italic" ),
             Resource::loadPixmap("italic"),
             tr( "&Italic" ), CTRL + Key_I,
             this, "textItalic" );
     connect( actionTextItalic, SIGNAL( activated() ), this,
        SLOT( textItalic() ) );
     actionTextItalic->addTo( tbStyle );
     actionTextItalic->setToggleAction( TRUE );
     actionTextUnderline = new QAction( tr( "Underline" ),
                Resource::loadPixmap("underline"),
                tr( "&Underline" ), CTRL + Key_U,
                this, "textUnderline" );
     connect( actionTextUnderline, SIGNAL( activated() ),
        this, SLOT( textUnderline() ) );
     actionTextUnderline->addTo( tbStyle );
     actionTextUnderline->setToggleAction( TRUE );
 
     alignMenu = new ButtonMenu( tbStyle );
     alignMenu->insertItem( Resource::loadPixmap("left"), tr("Left"), AlignLeft );
     alignMenu->insertItem( Resource::loadPixmap("center"), tr("Center"), AlignCenter );
     alignMenu->insertItem( Resource::loadPixmap("right"), tr("Right"), AlignRight );
     alignMenu->insertItem( Resource::loadPixmap("opie-write/justify"), tr("Full"), Qt3::AlignJustify );
     connect( alignMenu, SIGNAL(activated(int)), this, SLOT(textAlign(int)) );
 }
 
 Qt3::QTextEdit *MainWindow::currentEditor() const
 {
     return editor;
 }
 
 void MainWindow::doConnections( Qt3::QTextEdit *e )
 {
-    connect( e, SIGNAL( currentFontChanged( const QFont & ) ),
-       this, SLOT( fontChanged( const QFont & ) ) );
-    connect( e, SIGNAL( currentColorChanged( const QColor & ) ),
-       this, SLOT( colorChanged( const QColor & ) ) );
-    connect( e, SIGNAL( currentAlignmentChanged( int ) ),
-       this, SLOT( alignmentChanged( int ) ) );
+    connect( e, SIGNAL( currentFontChanged(const QFont&) ),
+       this, SLOT( fontChanged(const QFont&) ) );
+    connect( e, SIGNAL( currentColorChanged(const QColor&) ),
+       this, SLOT( colorChanged(const QColor&) ) );
+    connect( e, SIGNAL( currentAlignmentChanged(int) ),
+       this, SLOT( alignmentChanged(int) ) );
 }
 
 void MainWindow::updateFontSizeCombo( const QFont &f )
 {
     comboSize->clear();
     FontDatabase fdb;
     QValueList<int> sizes = fdb.pointSizes( f.family() );
     QValueList<int>::Iterator it = sizes.begin();
     for ( ; it != sizes.end(); ++it )
   comboSize->insertItem( QString::number( *it ) );
 }
 
 void MainWindow::editUndo()
 {
     if ( !currentEditor() )
   return;
     currentEditor()->undo();
 }
 
 void MainWindow::editRedo()
 {
     if ( !currentEditor() )
   return;
     currentEditor()->redo();
 }
 
 void MainWindow::editCut()
 {
     if ( !currentEditor() )
   return;
     currentEditor()->cut();
 }
 
 void MainWindow::editCopy()
 {
     if ( !currentEditor() )
   return;
     currentEditor()->copy();
 }
 
 void MainWindow::editPaste()
 {
     if ( !currentEditor() )
   return;
     currentEditor()->paste();
 }
 
 void MainWindow::textBold()
 {
     if ( !currentEditor() )
   return;
     currentEditor()->setBold( actionTextBold->isOn() );
 }
 
 void MainWindow::textUnderline()
 {
     if ( !currentEditor() )
   return;
     currentEditor()->setUnderline( actionTextUnderline->isOn() );
 }
 
 void MainWindow::textItalic()
 {
     if ( !currentEditor() )
   return;
     currentEditor()->setItalic( actionTextItalic->isOn() );
 }
 
 void MainWindow::textFamily( const QString &f )
 {
     if ( !currentEditor() )
   return;
     currentEditor()->setFamily( f );
     currentEditor()->viewport()->setFocus();
 }
 
 void MainWindow::textSize( const QString &p )
 {
     if ( !currentEditor() )
   return;
     currentEditor()->setPointSize( p.toInt() );
     currentEditor()->viewport()->setFocus();
 }
 
 void MainWindow::textStyle( int i )
 {
     if ( !currentEditor() )
   return;
     if ( i == 0 )
   currentEditor()->setParagType( Qt3::QStyleSheetItem::DisplayBlock,
                Qt3::QStyleSheetItem::ListDisc );
     else if ( i == 1 )
   currentEditor()->setParagType( Qt3::QStyleSheetItem::DisplayListItem,
                Qt3::QStyleSheetItem::ListDisc );
     else if ( i == 2 )
   currentEditor()->setParagType( Qt3::QStyleSheetItem::DisplayListItem,
diff --git a/noncore/apps/opie-write/qtextedit.cpp b/noncore/apps/opie-write/qtextedit.cpp
index 27dd515..73b7b7b 100644
--- a/noncore/apps/opie-write/qtextedit.cpp
+++ b/noncore/apps/opie-write/qtextedit.cpp
@@ -584,194 +584,194 @@ static bool block_set_alignment = FALSE;
 
   The new alignment is \a a.
 
   \sa setAlignment()
 */
 
 /*! \fn void QTextEdit::cursorPositionChanged( QTextCursor *c )
 
   This signal is emitted if the position of the cursor changed. \a c
   points to the text cursor object.
 
   \sa setCursorPosition()
 */
 
 /*! \overload void QTextEdit::cursorPositionChanged( int para, int pos )
 
   This signal is emitted if the position of the cursor changed. \a
   para contains the paragraph index and \a pos contains the character
   position within the paragraph.
 
   \sa setCursorPosition()
 */
 
 /*! \fn void QTextEdit::returnPressed()
 
   This signal is emitted if the user pressed the Return or the Enter key.
 */
 
 /*!
     \fn QTextCursor *QTextEdit::textCursor() const
 
     Returns the text edit's text cursor.
 
     \warning QTextCursor is not in the public API, but in special
     circumstances you might wish to use it.
 */
 
 /*!  Constructs an empty QTextEdit with parent \a parent and name \a
   name.
 */
 
 QTextEdit::QTextEdit( QWidget *parent, const char *name )
     : QScrollView( parent, name, WStaticContents | WRepaintNoErase | WResizeNoErase ),
       doc( new QTextDocument( 0 ) ), undoRedoInfo( doc )
 {
     init();
 }
 
 /*!
     Constructs a QTextEdit with parent \a parent and name \a name. The
     text edit will display the text \a text using context \a context.
 
     The \a context is a path which the text edit's QMimeSourceFactory
     uses to resolve the locations of files and images. It is passed to
     the mimeSourceFactory() when quering data.
 
     For example if the text contains an image tag,
     \c{<img src="image.png">}, and the context is "path/to/look/in", the
     QMimeSourceFactory will try to load the image from
     "path/to/look/in/image.png". If the tag was
     \c{<img src="/image.png">}, the context will not be used (because
     QMimeSourceFactory recognizes that we have used an absolute path)
     and will try to load "/image.png". The context is applied in exactly
     the same way to \e hrefs, for example,
     \c{<a href="target.html">Target</a>}, would resolve to
     "path/to/look/in/target.html".
 
 */
 
 QTextEdit::QTextEdit( const QString& text, const QString& context,
                       QWidget *parent, const char *name)
     : QScrollView( parent, name, WStaticContents | WRepaintNoErase | WResizeNoErase ),
       doc( new QTextDocument( 0 ) ), undoRedoInfo( doc )
 {
     init();
     setText( text, context );
 }
 
 /*! \reimp */
 
 QTextEdit::~QTextEdit()
 {
     delete undoRedoInfo.d;
     undoRedoInfo.d = 0;
     delete cursor;
     delete doc;
     delete d;
 }
 
 void QTextEdit::init()
 {
     setFrameStyle( Sunken );
     undoEnabled = TRUE;
     readonly = TRUE;
     setReadOnly( FALSE );
     d = new QTextEditPrivate;
-    connect( doc, SIGNAL( minimumWidthChanged( int ) ),
-             this, SLOT( documentWidthChanged( int ) ) );
+    connect( doc, SIGNAL( minimumWidthChanged(int) ),
+             this, SLOT( documentWidthChanged(int) ) );
 
     mousePressed = FALSE;
     inDoubleClick = FALSE;
     modified = FALSE;
     onLink = QString::null;
     overWrite = FALSE;
     wrapMode = WidgetWidth;
     wrapWidth = -1;
     wPolicy = AtWhiteSpace;
     inDnD = FALSE;
 
     doc->setFormatter( new QTextFormatterBreakWords );
     doc->formatCollection()->defaultFormat()->setFont( QScrollView::font() );
     doc->formatCollection()->defaultFormat()->setColor( colorGroup().color( QColorGroup::Text ) );
     currentFormat = doc->formatCollection()->defaultFormat();
     currentAlignment = Qt3::AlignAuto;
 
     viewport()->setBackgroundMode( PaletteBase );
     viewport()->setAcceptDrops( TRUE );
     resizeContents( 0, doc->lastParagraph() ?
                     ( doc->lastParagraph()->paragId() + 1 ) * doc->formatCollection()->defaultFormat()->height() : 0 );
 
     setKeyCompression( TRUE );
     viewport()->setMouseTracking( TRUE );
 #ifndef QT_NO_CURSOR
     viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
 #endif
     cursor = new QTextCursor( doc );
 
     formatTimer = new QTimer( this );
     connect( formatTimer, SIGNAL( timeout() ),
              this, SLOT( formatMore() ) );
     lastFormatted = doc->firstParagraph();
 
     scrollTimer = new QTimer( this );
     connect( scrollTimer, SIGNAL( timeout() ),
              this, SLOT( autoScrollTimerDone() ) );
 
     interval = 0;
     changeIntervalTimer = new QTimer( this );
     connect( changeIntervalTimer, SIGNAL( timeout() ),
              this, SLOT( doChangeInterval() ) );
 
     cursorVisible = TRUE;
     blinkTimer = new QTimer( this );
     connect( blinkTimer, SIGNAL( timeout() ),
              this, SLOT( blinkCursor() ) );
 
 #ifndef QT_NO_DRAGANDDROP
     dragStartTimer = new QTimer( this );
     connect( dragStartTimer, SIGNAL( timeout() ),
              this, SLOT( startDrag() ) );
 #endif
 
 
     formatMore();
 
     blinkCursorVisible = FALSE;
 
     viewport()->setFocusProxy( this );
     viewport()->setFocusPolicy( WheelFocus );
     viewport()->installEventFilter( this );
     installEventFilter( this );
 }
 
 void QTextEdit::paintDocument( bool drawAll, QPainter *p, int cx, int cy, int cw, int ch )
 {
     bool drawCur = hasFocus() || viewport()->hasFocus();
     if ( hasSelectedText() || isReadOnly() || !cursorVisible )
         drawCur = FALSE;
     QColorGroup g = colorGroup();
     if ( doc->paper() )
         g.setBrush( QColorGroup::Base, *doc->paper() );
 
     if ( contentsY() < doc->y() ) {
         p->fillRect( contentsX(), contentsY(), visibleWidth(), doc->y(),
                      g.brush( QColorGroup::Base ) );
     }
     if ( drawAll && doc->width() - contentsX() < cx + cw ) {
         p->fillRect( doc->width() - contentsX(), cy, cx + cw - doc->width() + contentsX(), ch,
                      g.brush( QColorGroup::Base ) );
     }
 
     p->setBrushOrigin( -contentsX(), -contentsY() );
 
     lastFormatted = doc->draw( p, cx, cy, cw, ch, g, !drawAll, drawCur, cursor );
 
     if ( lastFormatted == doc->lastParagraph() )
         resizeContents( contentsWidth(), doc->height() );
 
     if ( contentsHeight() < visibleHeight() && ( !doc->lastParagraph() || doc->lastParagraph()->isValid() ) && drawAll )
         p->fillRect( 0, contentsHeight(), visibleWidth(),
                      visibleHeight() - contentsHeight(), g.brush( QColorGroup::Base ) );
 }
 
 /*! \reimp */