2 files changed, 238 insertions, 235 deletions

diff --git a/noncore/apps/opie-reader/.cvsignore b/noncore/apps/opie-reader/.cvsignore
new file mode 100644
index 0000000..5344d1b
--- a/dev/null
+++ b/noncore/apps/opie-reader/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+moc*
\ No newline at end of file
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index 620e93e..06a35f6 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -68,16 +68,16 @@ void QTReaderApp::listBkmkFiles()
 
     while(1)
     {
-        struct dirent* de;
-        struct stat buf;
-        de = readdir(d);
-        if (de == NULL) break;
-
-        if (lstat((const char *)Global::applicationFileName("uqtreader",de->d_name),&buf) == 0 && S_ISREG(buf.st_mode))
-        {
-            bkmkselector->insertItem(de->d_name);
-            cnt++;
-        }
+  struct dirent* de;
+  struct stat buf;
+  de = readdir(d);
+  if (de == NULL) break;
+
+  if (lstat((const char *)Global::applicationFileName("uqtreader",de->d_name),&buf) == 0 && S_ISREG(buf.st_mode))
+  {
+      bkmkselector->insertItem(de->d_name);
+      cnt++;
+  }
     }
 
     closedir(d);
@@ -89,7 +89,7 @@ void QTReaderApp::listBkmkFiles()
         if (m_fontVisible) m_fontBar->hide();
         if (regVisible) regBar->hide();
         if (searchVisible) searchBar->hide();
-        m_nRegAction = cRmBkmkFile;
+  m_nRegAction = cRmBkmkFile;
         editorStack->raiseWidget( bkmkselector );
       }
     else
@@ -105,11 +105,11 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     pBkmklist = NULL;
     doc = 0;
 
-        m_fBkmksChanged = false;
+  m_fBkmksChanged = false;
     
   QString lang = getenv( "LANG" );
 
-        m_autogenstr = "^ *[A-Z].*[a-z] *$";
+  m_autogenstr = "^ *[A-Z].*[a-z] *$";
     setToolBarsMovable( FALSE );
 
     setIcon( Resource::loadPixmap( "uqtreader" ) );
@@ -420,10 +420,10 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     searchBar->setStretchableWidget( searchEdit );
 #ifdef __ISEARCH
     connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
-             this, SLOT( search( const QString& ) ) );
+       this, SLOT( search( const QString& ) ) );
 #else
     connect( searchEdit, SIGNAL( returnPressed( ) ),
-             this, SLOT( search( ) ) );
+       this, SLOT( search( ) ) );
 #endif
      a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 );
      connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );
@@ -445,7 +445,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     regBar->setStretchableWidget( regEdit );
 
     connect( regEdit, SIGNAL( returnPressed( ) ),
-             this, SLOT( do_regaction() ) );
+       this, SLOT( do_regaction() ) );
 
     a = new QAction( tr( "Do Reg" ), Resource::loadPixmap( "enter" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( do_regaction() ) );
@@ -464,23 +464,23 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     m_fontSelector = new QComboBox(false, m_fontBar);
     m_fontBar->setStretchableWidget( m_fontSelector );
     {
-        FontDatabase f;
-        m_fontSelector->insertStringList(f.families());
+  FontDatabase f;
+  m_fontSelector->insertStringList(f.families());
     } // delete the FontDatabase!!!
     connect( m_fontSelector, SIGNAL( activated(const QString& ) ),
-             this, SLOT( do_setfont(const QString&) ) );
+       this, SLOT( do_setfont(const QString&) ) );
 
     m_fontBar->hide();
     m_fontVisible = false;
 
     connect(qApp, SIGNAL( appMessage(const QCString&, const QByteArray& ) ),
-             this, SLOT( msgHandler(const QCString&, const QByteArray&) ) );
+       this, SLOT( msgHandler(const QCString&, const QByteArray&) ) );
 
 
     if (!reader->m_lastfile.isEmpty())
     {
-        openFile( reader->m_lastfile );
-        doc = new DocLnk(reader->m_lastfile);
+  openFile( reader->m_lastfile );
+  doc = new DocLnk(reader->m_lastfile);
     }
     m_EncodingAction[reader->m_encd]->setOn(true);
     do_setfont(reader->m_fontname);
@@ -495,14 +495,14 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
     QDataStream stream( _data, IO_ReadOnly );
     if ( msg == "info(QString)" )
     {
-        QString info;
-        stream >> info;
-        QMessageBox::information(this, "QTReader", info);
+  QString info;
+  stream >> info;
+  QMessageBox::information(this, "QTReader", info);
     } else if ( msg == "warn(QString)" )
     {
-        QString info;
-        stream >> info;
-        QMessageBox::warning(this, "QTReader", info);
+  QString info;
+  stream >> info;
+  QMessageBox::warning(this, "QTReader", info);
     }
 }
 
@@ -510,7 +510,7 @@ int QTReaderApp::EncNameToInt(const QString& _enc)
 {
     for (int i = 0; i < MAX_ENCODING; i++)
     {
-        if (m_EncodingAction[i]->text() == _enc) return i;
+  if (m_EncodingAction[i]->text() == _enc) return i;
     }
     return 0;
 /*
@@ -548,9 +548,9 @@ void QTReaderApp::TBDzoom()
 
 void QTReaderApp::clearBkmkList()
 {
-        delete pBkmklist;
-        pBkmklist = NULL;
-        m_fBkmksChanged = false;
+  delete pBkmklist;
+  pBkmklist = NULL;
+  m_fBkmksChanged = false;
 }
 
 void QTReaderApp::fileOpen()
@@ -563,14 +563,14 @@ void QTReaderApp::fileOpen()
 */
     if (pBkmklist != NULL)
     {
-        if (m_fBkmksChanged)
-        {
-            if (QMessageBox::warning(this, "QTReader", "Save bookmarks?", "Save", "Don't bother") == 0)
-                savebkmks();
-        }     
-        delete pBkmklist;
-        pBkmklist = NULL;
-        m_fBkmksChanged = false;
+  if (m_fBkmksChanged)
+  {
+      if (QMessageBox::warning(this, "QTReader", "Save bookmarks?", "Save", "Don't bother") == 0)
+    savebkmks();
+  }     
+  delete pBkmklist;
+  pBkmklist = NULL;
+  m_fBkmksChanged = false;
     }
     reader->disableAutoscroll();
 /*
@@ -578,15 +578,15 @@ void QTReaderApp::fileOpen()
     fileSelector->reread();
 */
     fileBrowser* fb = new fileBrowser(this,"QTReader",TRUE,
-                                      0,
-        //                            WStyle_Customize | WStyle_NoBorderEx,
-                                      "*", QFileInfo(reader->m_lastfile).dirPath(true));
+              0,
+//              WStyle_Customize | WStyle_NoBorderEx,
+              "*", QFileInfo(reader->m_lastfile).dirPath(true));
 
     if (fb->exec())
     {
-        QString fn(fb->fileList[0]);
+  QString fn(fb->fileList[0]);
 //    fb->populateList();
-        if (!fn.isEmpty() && QFileInfo(fn).isFile()) openFile(fn);
+  if (!fn.isEmpty() && QFileInfo(fn).isFile()) openFile(fn);
     }
     delete fb;
 }
@@ -596,19 +596,19 @@ void QTReaderApp::showinfo()
     unsigned long fs, ts, pl;
     if (reader->empty())
     {
-        QMessageBox::information(this, "QTReader", "No file loaded", 1);
+  QMessageBox::information(this, "QTReader", "No file loaded", 1);
     }
     else
     {
-        reader->sizes(fs,ts);
-        pl = reader->pagelocate();
-        m_infoWin->setFileSize(fs);
-        m_infoWin->setTextSize(ts);
-        m_infoWin->setRatio(100-(100*fs + (ts >> 1))/ts);
-        m_infoWin->setLocation(pl);
-        m_infoWin->setRead((100*pl + (ts >> 1))/ts);
-        editorStack->raiseWidget( m_infoWin );
-        m_infoWin->setFocus();
+  reader->sizes(fs,ts);
+  pl = reader->pagelocate();
+  m_infoWin->setFileSize(fs);
+  m_infoWin->setTextSize(ts);
+  m_infoWin->setRatio(100-(100*fs + (ts >> 1))/ts);
+  m_infoWin->setLocation(pl);
+  m_infoWin->setRead((100*pl + (ts >> 1))/ts);
+  editorStack->raiseWidget( m_infoWin );
+  m_infoWin->setFocus();
     }
 }
 
@@ -638,21 +638,21 @@ void QTReaderApp::editMark()
 
 void QTReaderApp::editCopy()
 {
-        QClipboard* cb = QApplication::clipboard();
-        QString text;
-        int ch;
-        unsigned long currentpos = reader->pagelocate();
-        unsigned long endpos = reader->locate();
-        reader->jumpto(m_savedpos);
-        while (reader->locate() < endpos && (ch = reader->getch()) != UEOF)
-        {
-            text += ch;
-        }
-        cb->setText(text);
-        //text = cb->text();
-        //if (text)
-        //      qDebug("The clipboard contains: %s", (const tchar*)text);
-        reader->locate(currentpos);
+  QClipboard* cb = QApplication::clipboard();
+  QString text;
+  int ch;
+  unsigned long currentpos = reader->pagelocate();
+  unsigned long endpos = reader->locate();
+  reader->jumpto(m_savedpos);
+  while (reader->locate() < endpos && (ch = reader->getch()) != UEOF)
+  {
+      text += ch;
+  }
+  cb->setText(text);
+//  text = cb->text();
+//  if (text)
+//    qDebug("The clipboard contains: %s", (const tchar*)text);
+  reader->locate(currentpos);
 #ifndef QT_NO_CLIPBOARD
 //  TBD();
   //    reader->copy();
@@ -731,8 +731,8 @@ void QTReaderApp::settarget()
 {
     m_nRegAction = cSetTarget;
     QString text = ((reader->m_targetapp.isEmpty()) ? QString("") : reader->m_targetapp)
-        + "/"
-        + ((reader->m_targetmsg.isEmpty()) ? QString("") : reader->m_targetmsg);
+  + "/"
+  + ((reader->m_targetmsg.isEmpty()) ? QString("") : reader->m_targetmsg);
     regEdit->setText(text);
     do_regedit();
 }
@@ -743,10 +743,10 @@ void QTReaderApp::do_overlap(const QString& lcn)
     unsigned long ulcn = lcn.toULong(&ok);
     if (ok)
     {
-        reader->m_overlap = ulcn;
+  reader->m_overlap = ulcn;
     }
     else
-        QMessageBox::information(this, "QTReader", "Must be a number");
+  QMessageBox::information(this, "QTReader", "Must be a number");
 }
 
 void QTReaderApp::do_mono(const QString& lcn)
@@ -755,11 +755,11 @@ void QTReaderApp::do_mono(const QString& lcn)
     unsigned long ulcn = lcn.toULong(&ok);
     if (ok)
     {
-        reader->m_charpc = ulcn;
-        //reader->setmono(true);
+  reader->m_charpc = ulcn;
+//  reader->setmono(true);
     }
     else
-        QMessageBox::information(this, "QTReader", "Must be a number");
+  QMessageBox::information(this, "QTReader", "Must be a number");
 }
 
 /*
@@ -845,15 +845,15 @@ bool QTReaderApp::dosearch(size_t start, CBuffer& test, const QRegExp& arg)
     {
       pos = reader->locate();
       if (!reader->buffdoc.getline(&test,reader->width()))
-        {
-          if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)
-            pos = searchStart;
-          else
-            pos = start;
-          ret = false;
-          findClose();
-          break;
-        }
+  {
+    if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)
+      pos = searchStart;
+    else
+      pos = start;
+    ret = false;
+    findClose();
+    break;
+  }
     }
   reader->locate(pos);
   return ret;
@@ -937,20 +937,20 @@ void QTReaderApp::openFile( const DocLnk &f )
     {
       QMessageBox::information(this, "QTReader", "File does not exist");
     }
-        
+  
 }
 
 void QTReaderApp::showEditTools()
 {
     if ( !doc )
-        close();
+  close();
 //    fileSelector->hide();
     menu->show();
     editBar->show();
     if ( searchVisible )
-        searchBar->show();
+  searchBar->show();
     if ( regVisible )
-        regBar->show();
+  regBar->show();
     if (m_fontVisible) m_fontBar->show();
 
     updateCaption();
@@ -961,27 +961,27 @@ void QTReaderApp::showEditTools()
 void QTReaderApp::save()
 {
     if ( !doc )
-        return;
+  return;
     if ( !editor->edited() )
-        return;
+  return;
 
     QString rt = editor->text();
     QString pt = rt;
 
     if ( doc->name().isEmpty() ) {
-        unsigned ispace = pt.find( ' ' );
-        unsigned ienter = pt.find( '\n' );
-        int i = (ispace < ienter) ? ispace : ienter;
-        QString docname;
-        if ( i == -1 ) {
-            if ( pt.isEmpty() )
-                docname = "Empty Text";
-            else
-                docname = pt;
-        } else {
-            docname = pt.left( i );
-        }
-        doc->setName(docname);
+  unsigned ispace = pt.find( ' ' );
+  unsigned ienter = pt.find( '\n' );
+  int i = (ispace < ienter) ? ispace : ienter;
+  QString docname;
+  if ( i == -1 ) {
+      if ( pt.isEmpty() )
+    docname = "Empty Text";
+      else
+    docname = pt;
+  } else {
+      docname = pt.left( i );
+  }
+  doc->setName(docname);
     }
     FileManager fm;
     fm.saveFile( *doc, rt );
@@ -993,9 +993,9 @@ void QTReaderApp::clear()
     if (doc != 0)
       {
 //  QMessageBox::information(this, "QTReader", "Deleting doc", 1);
-        delete doc;
+  delete doc;
 //  QMessageBox::information(this, "QTReader", "Deleted doc", 1);
-        doc = 0;
+  doc = 0;
       }
     reader->clear();
 }
@@ -1003,12 +1003,12 @@ void QTReaderApp::clear()
 void QTReaderApp::updateCaption()
 {
     if ( !doc )
-        setCaption( tr("QTReader") );
+  setCaption( tr("Opie Reader") );
     else {
-        QString s = doc->name();
-        if ( s.isEmpty() )
-            s = tr( "Unnamed" );
-        setCaption( s + " - " + tr("QTReader") );
+  QString s = doc->name();
+  if ( s.isEmpty() )
+      s = tr( "Unnamed" );
+  setCaption( s + " - " + tr("Opie Reader") );
     }
 }
 
@@ -1025,37 +1025,37 @@ void QTReaderApp::closeEvent( QCloseEvent *e )
     if (editorStack->visibleWidget() == reader)
     {
         if (m_fontVisible)
-        {
-            m_fontBar->hide();
-            m_fontVisible = false;
-        }
-        if (regVisible)
-        {
-            regBar->hide();
-            regVisible = false;
-            return;
-        }
-        if (searchVisible)
-        {
-            searchBar->hide();
-            searchVisible = false;
-            return;
-        }
-        if (m_fBkmksChanged && pBkmklist != NULL)
-        {
-            if (QMessageBox::warning(this, "QTReader", "Save bookmarks?", "Save", "Don't bother") == 0)
-                savebkmks();
-            delete pBkmklist;
-            pBkmklist = NULL;
-            m_fBkmksChanged = false;
-        }
-        bFromDocView = FALSE;
-        saveprefs();
-        e->accept();
+  {
+      m_fontBar->hide();
+      m_fontVisible = false;
+  }
+  if (regVisible)
+  {
+      regBar->hide();
+      regVisible = false;
+      return;
+  }
+  if (searchVisible)
+  {
+      searchBar->hide();
+      searchVisible = false;
+      return;
+  }
+  if (m_fBkmksChanged && pBkmklist != NULL)
+  {
+      if (QMessageBox::warning(this, "QTReader", "Save bookmarks?", "Save", "Don't bother") == 0)
+    savebkmks();
+      delete pBkmklist;
+      pBkmklist = NULL;
+      m_fBkmksChanged = false;
+  }
+  bFromDocView = FALSE;
+  saveprefs();
+  e->accept();
     }
     else
     {
-        showEditTools();
+  showEditTools();
     }
 }
 
@@ -1077,16 +1077,16 @@ void QTReaderApp::listbkmk()
     int cnt = 0;
     if (pBkmklist != NULL)
       {
-              if (m_fBkmksChanged) pBkmklist->sort();
-        for (CList<Bkmk>::iterator i = pBkmklist->begin(); i != pBkmklist->end(); i++)
-          {
+        if (m_fBkmksChanged) pBkmklist->sort();
+  for (CList<Bkmk>::iterator i = pBkmklist->begin(); i != pBkmklist->end(); i++)
+    {
 #ifdef _UNICODE
-            bkmkselector->insertItem(toQString(i->name()));
+      bkmkselector->insertItem(toQString(i->name()));
 #else
-            bkmkselector->insertItem(i->name());
+      bkmkselector->insertItem(i->name());
 #endif
-            cnt++;
-          }
+      cnt++;
+    }
       }
     if (cnt > 0)
       {
@@ -1120,17 +1120,17 @@ void QTReaderApp::gotobkmk(int ind)
 {
     switch (m_nRegAction)
     {
-        case cGotoBkmk:
-            reader->locate((*pBkmklist)[ind]->value());
-            break;
-        case cDelBkmk:
-        //    qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name());
-            pBkmklist->erase(ind);
-            m_fBkmksChanged = true;
-            break;
-        case cRmBkmkFile:
-            unlink((const char *)Global::applicationFileName("uqtreader",bkmkselector->text(ind)));
-            break;
+  case cGotoBkmk:
+      reader->locate((*pBkmklist)[ind]->value());
+      break;
+  case cDelBkmk:
+//      qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name());
+      pBkmklist->erase(ind);
+      m_fBkmksChanged = true;
+      break;
+  case cRmBkmkFile:
+      unlink((const char *)Global::applicationFileName("uqtreader",bkmkselector->text(ind)));
+      break;
     }
   showEditTools();
 }
@@ -1154,9 +1154,9 @@ void QTReaderApp::do_jump(const QString& lcn)
     bool ok;
     unsigned long ulcn = lcn.toULong(&ok);
     if (ok)
-        reader->locate(ulcn);
+  reader->locate(ulcn);
     else
-        QMessageBox::information(this, "QTReader", "Must be a number");
+  QMessageBox::information(this, "QTReader", "Must be a number");
 }
 
 void QTReaderApp::do_regaction()
@@ -1166,23 +1166,23 @@ void QTReaderApp::do_regaction()
   switch(m_nRegAction)
   {
       case cAutoGen:
-          do_autogen(regEdit->text());
-          break;
+    do_autogen(regEdit->text());
+    break;
       case cAddBkmk:
-          do_addbkmk(regEdit->text());
-          break;
+    do_addbkmk(regEdit->text());
+    break;
       case cJump:
-          do_jump(regEdit->text());
-          break;
+    do_jump(regEdit->text());
+    break;
       case cMonoSpace:
-          do_mono(regEdit->text());
-          break;
+    do_mono(regEdit->text());
+    break;
       case cOverlap:
-          do_overlap(regEdit->text());
-          break;
+    do_overlap(regEdit->text());
+    break;
       case cSetTarget:
-          do_settarget(regEdit->text());
-          break;
+    do_settarget(regEdit->text());
+    break;
   }
   reader->restore();
 //    editBar->show();
@@ -1194,14 +1194,14 @@ void QTReaderApp::do_settarget(const QString& _txt)
     int ind = _txt.find('/');
     if (ind == -1)
     {
-        reader->m_targetapp = "";
-        reader->m_targetmsg = "";
-        QMessageBox::information(this, "QTReader", "Format is\nappname/messagename");
+  reader->m_targetapp = "";
+  reader->m_targetmsg = "";
+  QMessageBox::information(this, "QTReader", "Format is\nappname/messagename");
     }
     else
     {
-        reader->m_targetapp = _txt.left(ind);
-        reader->m_targetmsg = _txt.right(_txt.length()-ind-1);
+  reader->m_targetapp = _txt.left(ind);
+  reader->m_targetmsg = _txt.right(_txt.length()-ind-1);
     }
 }
 
@@ -1209,11 +1209,11 @@ void QTReaderApp::setfont()
 {
     for (int i = 1; i <= m_fontSelector->count(); i++)
     {
-        if (m_fontSelector->text(i) == reader->m_fontname)
-        {
-            m_fontSelector->setCurrentItem(i);
-            break;
-        }
+  if (m_fontSelector->text(i) == reader->m_fontname)
+  {
+      m_fontSelector->setCurrentItem(i);
+      break;
+  }
     }
     m_fontBar->show();
     m_fontVisible = true;
@@ -1259,9 +1259,9 @@ pbar->resize(width(), editBar->height());
       if (pc != lastpc)
       {
         pbar->setProgress(pc);
-        qApp->processEvents();
-        if (reader->locate() != lcn) reader->jumpto(lcn);
-        reader->setFocus();
+  qApp->processEvents();
+  if (reader->locate() != lcn) reader->jumpto(lcn);
+  reader->setFocus();
         lastpc = pc;
       }
       i = reader->buffdoc.getpara(buff);
@@ -1270,7 +1270,7 @@ pbar->resize(width(), editBar->height());
 #else
       if (re.match(buff.data()) != -1)
 #endif
-        pBkmklist->push_back(Bkmk(buff.data(),lcn));
+  pBkmklist->push_back(Bkmk(buff.data(),lcn));
     }
   pbar->setProgress(100);
   qApp->processEvents();
@@ -1334,40 +1334,40 @@ void info_cb(Fl_Widget* o, void* _data)
 
     if (infowin == NULL)
     {
-        
-        infowin = new Fl_Window(160,240);
-        filename = new Fl_Output(45,5,110,14,"Filename");
-        filesize = new Fl_Output(45,25,110,14,"Filesize");
-        textsize = new Fl_Output(45,45,110,14,"Textsize");
-        comprat = new CBar(45,65,110,14,"Ratio %");
-        posn = new Fl_Output(45,85,110,14,"Location");
-        frcn = new CBar(45,105,110,14,"% Read");
-        about = new Fl_Multiline_Output(5,125,150,90);
-        about->value("TWReader - $Name$\n\nA file reader program for the Agenda\n\nReads text, PalmDoc and ppms format files");
-        Fl_Button *jump_accept = new Fl_Button(62,220,35,14,"Okay");
-        infowin->set_modal();
+  
+  infowin = new Fl_Window(160,240);
+  filename = new Fl_Output(45,5,110,14,"Filename");
+  filesize = new Fl_Output(45,25,110,14,"Filesize");
+  textsize = new Fl_Output(45,45,110,14,"Textsize");
+  comprat = new CBar(45,65,110,14,"Ratio %");
+  posn = new Fl_Output(45,85,110,14,"Location");
+  frcn = new CBar(45,105,110,14,"% Read");
+  about = new Fl_Multiline_Output(5,125,150,90);
+  about->value("TWReader - $Name$\n\nA file reader program for the Agenda\n\nReads text, PalmDoc and ppms format files");
+  Fl_Button *jump_accept = new Fl_Button(62,220,35,14,"Okay");
+  infowin->set_modal();
     }
     if (((reader_ui *)_data)->g_filename[0] != '\0')
     {
-        unsigned long fs,ts;
-        tchar sz[20];
-        ((reader_ui *)_data)->input->sizes(fs,ts);
-        unsigned long pl = ((reader_ui *)_data)->input->locate();
+  unsigned long fs,ts;
+  tchar sz[20];
+  ((reader_ui *)_data)->input->sizes(fs,ts);
+  unsigned long pl = ((reader_ui *)_data)->input->locate();
 
-        filename->value(((reader_ui *)_data)->g_filename);
+  filename->value(((reader_ui *)_data)->g_filename);
 
-        sprintf(sz,"%u",fs);
-        filesize->value(sz);
+  sprintf(sz,"%u",fs);
+  filesize->value(sz);
 
-        sprintf(sz,"%u",ts);
-        textsize->value(sz);
+  sprintf(sz,"%u",ts);
+  textsize->value(sz);
 
-        comprat->value(100-(100*fs + (ts >> 1))/ts);
+  comprat->value(100-(100*fs + (ts >> 1))/ts);
 
-        sprintf(sz,"%u",pl);
-        posn->value(sz);
+  sprintf(sz,"%u",pl);
+  posn->value(sz);
 
-        frcn->value((100*pl + (ts >> 1))/ts);
+  frcn->value((100*pl + (ts >> 1))/ts);
     }
     infowin->show();
 }
@@ -1377,27 +1377,27 @@ void QTReaderApp::savebkmks()
 {
     if (pBkmklist != NULL)
     {
-        BkmkFile bf((const char *)Global::applicationFileName("uqtreader",reader->m_string), true);
-        bf.write(*pBkmklist);
+  BkmkFile bf((const char *)Global::applicationFileName("uqtreader",reader->m_string), true);
+  bf.write(*pBkmklist);
     }
-        m_fBkmksChanged = false;
+  m_fBkmksChanged = false;
 }
 
 void QTReaderApp::readbkmks()
 {
     if (pBkmklist != NULL)
     {
-            delete pBkmklist;
+      delete pBkmklist;
     }
     BkmkFile bf((const char *)Global::applicationFileName("uqtreader",reader->m_string));
     pBkmklist = bf.readall();
     m_fBkmksChanged = false;
     if (pBkmklist == NULL)
     {
-        pBkmklist = reader->getbkmklist();
+  pBkmklist = reader->getbkmklist();
     }
     if (pBkmklist != NULL)
-        pBkmklist->sort();
+  pBkmklist->sort();
 }
 
 void QTReaderApp::addbkmk()
@@ -1409,25 +1409,25 @@ void QTReaderApp::addbkmk()
 
 void QTReaderApp::do_addbkmk(const QString& text)
 {
-        if (text.isEmpty())
-        {
-          QMessageBox::information(this, "QTReader", "Need a name for the bookmark\nSelect add again", 1);
-        }
-        else
-        {
-                if (pBkmklist == NULL) pBkmklist = new CList<Bkmk>;
+  if (text.isEmpty())
+  {
+    QMessageBox::information(this, "QTReader", "Need a name for the bookmark\nSelect add again", 1);
+  }
+  else
+  {
+    if (pBkmklist == NULL) pBkmklist = new CList<Bkmk>;
 #ifdef _UNICODE
-                CBuffer buff;
-                int i = 0;
-                for (i = 0; i < text.length(); i++)
-                {
-                    buff[i] = text[i].unicode();
-                }
-                buff[i] = 0;
-                pBkmklist->push_front(Bkmk(buff.data(), reader->pagelocate()));
+    CBuffer buff;
+    int i = 0;
+    for (i = 0; i < text.length(); i++)
+    {
+        buff[i] = text[i].unicode();
+    }
+    buff[i] = 0;
+    pBkmklist->push_front(Bkmk(buff.data(), reader->pagelocate()));
 #else
-                pBkmklist->push_front(Bkmk((const tchar*)text,reader->pagelocate()));
+    pBkmklist->push_front(Bkmk((const tchar*)text,reader->pagelocate()));
 #endif
-                m_fBkmksChanged = true;
-        }
+    m_fBkmksChanged = true;
+  }
 }