2 files changed, 16 insertions, 16 deletions

diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index e759249..b0d589e 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -308,69 +308,69 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     QPopupMenu *settings = new QPopupMenu( this );
     tmp->insertItem( tr( "Settings" ), settings );
 
 //    addToolBar(menubar, "Menus",QMainWindow::Top);
 //    addToolBar(fileBar, "Toolbar",QMainWindow::Top);
 
     //    QPopupMenu *edit = new QPopupMenu( this );
 
     /*
     QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
     a->addTo( bar );
     a->addTo( file );
     */
 
     editorStack = new QWidgetStack( this );
     setCentralWidget( editorStack );
 
     searchVisible = FALSE;
     regVisible = FALSE;
     m_fontVisible = false;
 
     m_annoWin = new CAnnoEdit(editorStack);
     editorStack->addWidget(m_annoWin, get_unique_id());
-    connect( m_annoWin, SIGNAL( finished(const QString&, const QString&) ), this, SLOT( addAnno(const QString&, const QString&) ) );
+    connect( m_annoWin, SIGNAL( finished(const QString&,const QString&) ), this, SLOT( addAnno(const QString&,const QString&) ) );
     connect( m_annoWin, SIGNAL( cancelled() ), this, SLOT( infoClose() ) );
 
     m_infoWin = new infowin(editorStack);
     editorStack->addWidget(m_infoWin, get_unique_id());
     connect( m_infoWin, SIGNAL( Close() ), this, SLOT( infoClose() ) );
 
     m_graphicwin = new GraphicWin(editorStack);
     editorStack->addWidget(m_graphicwin, get_unique_id());
     connect( m_graphicwin, SIGNAL( Closed() ), this, SLOT( infoClose() ) );
 
 //    bkmkselector = new QListBox(editorStack, "Bookmarks");
     bkmkselector = new CBkmkSelector(editorStack, "Bookmarks");
     //    connect(bkmkselector, SIGNAL( selected(const QString&) ), this, SLOT( gotobkmk(const QString&) ) );
     connect(bkmkselector, SIGNAL( selected(int) ), this, SLOT( gotobkmk(int) ) );
     connect(bkmkselector, SIGNAL( cancelled() ), this, SLOT( cancelbkmk() ) );
     editorStack->addWidget( bkmkselector, get_unique_id() );
 
 /*
     importSelector = new FileSelector( "*", editorStack, "importselector", false );
-    connect( importSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( importFile( const DocLnk & ) ) );
+    connect( importSelector, SIGNAL( fileSelected(const DocLnk&) ), this, SLOT( importFile(const DocLnk&) ) );
 
     editorStack->addWidget( importSelector, get_unique_id() );
 
     // don't need the close visible, it is redundant...
     importSelector->setCloseVisible( FALSE );
 */    
 //    qDebug("Reading file list");
     readfilelist();
 
     reader = new QTReader( editorStack );
 
     reader->bDoUpdates = false;
 
 #ifdef USEQPE
     ((QPEApplication*)qApp)->setStylusOperation(reader, QPEApplication::RightOnHold);
 #endif
 
 //    qDebug("Reading config");
 //  Config config( APPDIR );
   config.setGroup( "View" );
   m_debounce = config.readNumEntry("Debounce", 0);
 #ifdef USEQPE
   m_bFloatingDialog = config.readBoolEntry("FloatDialogs", false);
 #else
@@ -432,49 +432,49 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
   m_rightScroll = config.readBoolEntry("RightScroll", false);
   m_upScroll = config.readBoolEntry("UpScroll", true);
   m_downScroll = config.readBoolEntry("DownScroll", true);
 
   m_propogatefontchange = config.readBoolEntry( "RequestorFontChange", false);
   reader->setBaseSize(config.readNumEntry( "Basesize", 10 ));
 
 #ifndef USEQPE
         config.setGroup( "Geometry" );
         setGeometry(0,0,
         config.readNumEntry( "width", QApplication::desktop()->width()/2 ),
         config.readNumEntry( "height", QApplication::desktop()->height()/2 ));
         move(
         config.readNumEntry( "x", 20 ),
         config.readNumEntry( "y", 20 ));
 #endif
 
 
 
   setTwoTouch(m_twoTouch);
 
     connect( reader, SIGNAL( OnShowPicture(QImage&) ), this, SLOT( showgraphic(QImage&) ) );
 
     connect( reader, SIGNAL( OnRedraw() ), this, SLOT( OnRedraw() ) );
-    connect( reader, SIGNAL( OnWordSelected(const QString&, size_t, const QString&) ), this, SLOT( OnWordSelected(const QString&, size_t, const QString&) ) );
+    connect( reader, SIGNAL( OnWordSelected(const QString&,size_t,const QString&) ), this, SLOT( OnWordSelected(const QString&,size_t,const QString&) ) );
     connect( reader, SIGNAL( OnURLSelected(const QString&) ), this, SLOT( OnURLSelected(const QString&) ) );
     editorStack->addWidget( reader, get_unique_id() );
 
     m_preferences_action = new QAction( tr( "Configuration" ), geticon( "SettingsIcon" ), QString::null, 0, this, NULL);
     connect( m_preferences_action, SIGNAL( activated() ), this, SLOT( showprefs() ) );
     m_preferences_action->addTo( settings );
 
     m_saveconfig_action = new QAction( tr( "Save Config" ), QString::null, 0, this, NULL);
     connect( m_saveconfig_action, SIGNAL( activated() ), this, SLOT( SaveConfig() ) );
     m_saveconfig_action->addTo( settings );
 
     m_loadconfig_action = new QAction( tr( "Load Config" ), QString::null, 0, this, NULL);
     connect( m_loadconfig_action, SIGNAL( activated() ), this, SLOT( LoadConfig() ) );
     m_loadconfig_action->addTo( settings );
 
     m_tidyconfig_action = new QAction( tr( "Delete Config" ), QString::null, 0, this, NULL);
     connect( m_tidyconfig_action, SIGNAL( activated() ), this, SLOT( TidyConfig() ) );
     m_tidyconfig_action->addTo( settings );
 
     settings->insertSeparator();
     m_toolbarprefs_action = new QAction( tr( "Toolbars" ), QString::null, 0, this, NULL);
     connect( m_toolbarprefs_action, SIGNAL( activated() ), this, SLOT( showtoolbarprefs() ) );
     m_toolbarprefs_action->addTo( settings );
 
@@ -705,122 +705,122 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     m_endBlock_action->addTo( marks );
 
     m_bkmkAvail = NULL;
 
 
     setToolBarsMovable(m_tbmove);
     addtoolbars(&config);
 
     pbar = new QProgressBar(this);
     pbar->hide();
 
     searchBar = new QFloatBar( "Search", this, QMainWindow::Top, TRUE );
 
     searchBar->setHorizontalStretchable( TRUE );
 
     connect(searchBar, SIGNAL( OnHide() ), this, SLOT( restoreFocus() ));
 
     searchEdit = new QLineEdit( searchBar, "searchEdit" );
 //      QFont f("unifont", 16 /*, QFont::Bold*/);
 //      searchEdit->setFont( f );
     searchBar->setStretchableWidget( searchEdit );
 
 
 #ifdef __ISEARCH
-    connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
-             this, SLOT( search( const QString& ) ) );
+    connect( searchEdit, SIGNAL( textChanged(const QString&) ),
+             this, SLOT( search(const QString&) ) );
 #else
-    connect( searchEdit, SIGNAL( returnPressed( ) ),
-             this, SLOT( search( ) ) );
+    connect( searchEdit, SIGNAL( returnPressed() ),
+             this, SLOT( search() ) );
 #endif
      QAction*a = new QAction( tr( "Find Next" ), geticon( "next" ), QString::null, 0, this, 0 );
      connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );
      a->addTo( searchBar );
 
     a = new QAction( tr( "Close Find" ), geticon( "close" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
     a->addTo( searchBar );
 
     searchBar->hide();
 
     regBar = new QFloatBar( "Autogen", this, QMainWindow::Top, TRUE );
     connect(regBar, SIGNAL( OnHide() ), this, SLOT( restoreFocus() ));
 
     regBar->setHorizontalStretchable( TRUE );
 
     regEdit = new QLineEdit( regBar, "regEdit" );
 //    regEdit->setFont( f );
 
     regBar->setStretchableWidget( regEdit );
 
-    connect( regEdit, SIGNAL( returnPressed( ) ),
+    connect( regEdit, SIGNAL( returnPressed() ),
              this, SLOT( do_regaction() ) );
 
     a = new QAction( tr( "Do Reg" ), geticon( "enter" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( do_regaction() ) );
     a->addTo( regBar );
 
     a = new QAction( tr( "Close Edit" ), geticon( "close" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( regClose() ) );
     a->addTo( regBar );
 
     regBar->hide();
 
     m_fontBar = new QToolBar( "Autogen", this, QMainWindow::Top, TRUE );
 
     m_fontBar->setHorizontalStretchable( TRUE );
 
 //    qDebug("Font selector");
     m_fontSelector = new QComboBox(false, m_fontBar);
     m_fontBar->setStretchableWidget( m_fontSelector );
     {
 #ifndef USEQPE
         QFontDatabase f;
 #else
         FontDatabase f;
 #endif
         QStringList flist = f.families();
         bool realfont = false;
         for (QStringList::Iterator nm = flist.begin(); nm != flist.end(); nm++)
         {
             if (reader->m_fontname == *nm)
             {
                 realfont = true;
             }
             if ((*nm).contains(FIXEDFONT,false)) reader->m_fontControl.hasCourier(true, *nm);
         }
         if (!realfont) reader->m_fontname = flist[0];
     } // delete the FontDatabase!!!
-    connect( m_fontSelector, SIGNAL( activated(const QString& ) ),
+    connect( m_fontSelector, SIGNAL( activated(const QString&) ),
              this, SLOT( do_setfont(const QString&) ) );
-    connect( m_fontSelector, SIGNAL( activated(int ) ),
+    connect( m_fontSelector, SIGNAL( activated(int) ),
              this, SLOT( do_setencoding(int) ) );
 
     m_fontBar->hide();
     m_fontVisible = false;
 #ifdef USEMSGS
-    connect(qApp, SIGNAL( appMessage(const QCString&, const QByteArray& ) ),
-             this, SLOT( msgHandler(const QCString&, const QByteArray&) ) );
+    connect(qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ),
+             this, SLOT( msgHandler(const QCString&,const QByteArray&) ) );
 #endif
 //    qDebug("Initing");
   reader->init();
 //    qDebug("Inited");
 //    m_buttonAction[m_spaceTarget]->setOn(true);
 //    qDebug("fonting");
     do_setfont(reader->m_fontname);
     if (!reader->m_lastfile.isEmpty())
     {
         //qDebug("doclnk");
         //doc = new DocLnk(reader->m_lastfile);
         //qDebug("doclnk done");
         if (pOpenlist != NULL)
         {
 
 /*
             int ind = 0;
             Bkmk* p = (*pOpenlist)[ind];
             while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile)
             {
                 p = (*pOpenlist)[++ind];
             }
 */
             Bkmk* p = NULL;
diff --git a/noncore/apps/opie-reader/fileBrowser.cpp b/noncore/apps/opie-reader/fileBrowser.cpp
index ebd14f3..e1cde6c 100644
--- a/noncore/apps/opie-reader/fileBrowser.cpp
+++ b/noncore/apps/opie-reader/fileBrowser.cpp
@@ -53,52 +53,52 @@ fileBrowser::fileBrowser( bool allownew, QWidget* parent,  const char* name, boo
 
     buttonShowHidden = new QPushButton( this, "buttonShowHidden" );
 //    buttonShowHidden->setFixedSize( 50, 25 );
     buttonShowHidden->setText( tr( "Hidden" ) );
     buttonShowHidden->setAutoDefault( false );
     buttonShowHidden->setToggleButton( true );
     buttonShowHidden->setOn( false );
 
     dirLabel = new QLabel(this, "DirLabel");
     dirLabel->setAlignment(AlignLeft | AlignVCenter | ExpandTabs | WordBreak);
     dirLabel->setText(currentDir.canonicalPath());
 
     ListView = new QtrListView( this, "ListView" );
     ListView->addColumn( tr( "Name" ) );
     ListView->setSorting( 2, FALSE);
     ListView->addColumn( tr( "Size" ) );
     ListView->setSelectionMode(QListView::Single);
     ListView->setAllColumnsShowFocus( TRUE );
     ListView->setColumnWidthMode(0, QListView::Manual);
     ListView->setColumnWidthMode(1, QListView::Manual);
 
     // signals and slots connections
     connect( buttonShowHidden, SIGNAL( toggled(bool) ), this, SLOT( setHidden(bool) ) );
     connect( buttonOk, SIGNAL( clicked() ), this, SLOT( OnRoot() ) );
-    connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) );
-    connect( ListView, SIGNAL(clicked( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
-    connect( ListView, SIGNAL(OnOKButton( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
-    connect( ListView, SIGNAL(OnCentreButton( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
+    connect( ListView, SIGNAL(doubleClicked(QListViewItem*)), SLOT(listDoubleClicked(QListViewItem*)) );
+    connect( ListView, SIGNAL(clicked(QListViewItem*)), SLOT(listClicked(QListViewItem*)) );
+    connect( ListView, SIGNAL(OnOKButton(QListViewItem*)), SLOT(listClicked(QListViewItem*)) );
+    connect( ListView, SIGNAL(OnCentreButton(QListViewItem*)), SLOT(listClicked(QListViewItem*)) );
     connect( ListView, SIGNAL(OnCancelButton()), SLOT(OnCancel()) );
 
     QVBoxLayout* grid = new QVBoxLayout(this);
     QHBoxLayout* hgrid = new QHBoxLayout(grid);
     hgrid->addWidget(dirLabel,1);
     hgrid->addWidget(buttonShowHidden);
     hgrid->addWidget(buttonOk);
     grid->addWidget(ListView,1);
     if (allownew)
     {
         m_filename = new QLineEdit(this);
         grid->addWidget(m_filename);
         connect( m_filename, SIGNAL( returnPressed() ), this, SLOT( onReturn() ));
     }
     else
     {
         m_filename = NULL;
     }
 
     if (QFileInfo(iPath).exists())
     {
         currentDir.setPath(iPath);
 #ifdef _WINDOWS
         _chdir(iPath.latin1());