3 files changed, 25 insertions, 25 deletions

diff --git a/noncore/apps/opie-reader/Bkmks.cpp b/noncore/apps/opie-reader/Bkmks.cpp
index 92ed69f..0cb9ea9 100644
--- a/noncore/apps/opie-reader/Bkmks.cpp
+++ b/noncore/apps/opie-reader/Bkmks.cpp
@@ -170,7 +170,7 @@ CList<Bkmk>* BkmkFile::readall()
         fread(&newmagic, sizeof(newmagic), 1, f);
         if (newmagic != magic)
         {
-            if (QMessageBox::warning(NULL, "Old bookmark file!", "Which version of QTReader\ndid you upgrade from?", "0_4*", "Any other version") == 0)
+      if (QMessageBox::warning(NULL, "Old bookmark file!", "Which version of OpieReader\ndid you upgrade from?", "0_4*", "Any other version") == 0)
             {
                 fseek(f,0,SEEK_SET);
                 bl = readall04();
diff --git a/noncore/apps/opie-reader/BuffDoc.cpp b/noncore/apps/opie-reader/BuffDoc.cpp
index e37b136..d4541ea 100644
--- a/noncore/apps/opie-reader/BuffDoc.cpp
+++ b/noncore/apps/opie-reader/BuffDoc.cpp
@@ -209,7 +209,7 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
     if (ret != 0)
     {
         delete exp;
-        QMessageBox::information(_parent, "QTReader", "Unknown file compression type","Try another file");
+  QMessageBox::information(_parent, "OpieReader", "Unknown file compression type","Try another file");
         return ret;
     }
     //        qDebug("Doing final open:%x:%x",exp,filt);
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index 0608b66..ef1f4f1 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -99,7 +99,7 @@ void QTReaderApp::listBkmkFiles()
         editorStack->raiseWidget( bkmkselector );
       }
     else
-      QMessageBox::information(this, "QTReader", "No bookmark files");
+      QMessageBox::information(this, "OpieReader", "No bookmark files");
 }
 
 QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
@@ -118,7 +118,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
         m_autogenstr = "^ *[A-Z].*[a-z] *$";
     setToolBarsMovable( FALSE );
 
-    setIcon( Resource::loadPixmap( "uqtreader" ) );
+    setIcon( Resource::loadPixmap( "opie-reader/uqtreader" ) );
 
     QPEToolBar *bar = new QPEToolBar( this );
     bar->setHorizontalStretchable( TRUE );
@@ -255,7 +255,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     connect(ag, SIGNAL( selected(QAction*) ), this, SLOT( buttonActionSelected(QAction*) ) );
 
 
-    a = m_scrollButton = new QAction( tr( "Scroll" ), Resource::loadPixmap( "panel-arrow-down" ), QString::null, 0, this, 0, true );
+    a = m_scrollButton = new QAction( tr( "Scroll" ), Resource::loadPixmap( "opie-reader/panel-arrow-down" ), QString::null, 0, this, 0, true );
 //    connect( a, SIGNAL( activated() ), this, SLOT( autoScroll() ) );
     a->setOn(false);
     connect( a, SIGNAL( toggled(bool) ), this, SLOT( autoScroll(bool) ) );
@@ -630,13 +630,13 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
     {
         QString info;
         stream >> info;
-        QMessageBox::information(this, "QTReader", info);
+  QMessageBox::information(this, "OpieReader", info);
     }
     else if ( msg == "warn(QString)" )
     {
         QString info;
         stream >> info;
-        QMessageBox::warning(this, "QTReader", info);
+  QMessageBox::warning(this, "OpieReader", info);
     }
 
 
@@ -751,7 +751,7 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
             pos = reader->locate();
             if (!reader->buffdoc.getline(&test,reader->width()))
             {
-                QMessageBox::information(this, "QTReader", QString("Can't find\n")+info);
+    QMessageBox::information(this, "OpieReader", QString("Can't find\n")+info);
                 pos = start;
                 break;
             }
@@ -914,12 +914,12 @@ void QTReaderApp::autoScroll(bool _b)
 
 void QTReaderApp::TBD()
 {
-  QMessageBox::information(this, "QTReader", "Not yet implemented", 1);
+  QMessageBox::information(this, "OpieReader", "Not yet implemented", 1);
 }
 
 void QTReaderApp::TBDzoom()
 {
-  QMessageBox::information(this, "QTReader", "Zooming is done interactively\nTry left/right cursor keys", 1);
+  QMessageBox::information(this, "OpieReader", "Zooming is done interactively\nTry left/right cursor keys", 1);
 }
 
 void QTReaderApp::clearBkmkList()
@@ -941,7 +941,7 @@ void QTReaderApp::fileOpen()
     {
         if (m_fBkmksChanged)
         {
-            if (QMessageBox::warning(this, "QTReader", "Save bookmarks?", "Save", "Don't bother") == 0)
+      if (QMessageBox::warning(this, "OpieReader", "Save bookmarks?", "Save", "Don't bother") == 0)
                 savebkmks();
         }     
         delete pBkmklist;
@@ -953,7 +953,7 @@ void QTReaderApp::fileOpen()
     editorStack->raiseWidget( fileSelector );
     fileSelector->reread();
 */
-    fileBrowser* fb = new fileBrowser(this,"QTReader",TRUE,
+    fileBrowser* fb = new fileBrowser(this,"OpieReader",TRUE,
                                       0,
         //                            WStyle_Customize | WStyle_NoBorderEx,
                                       "*", QFileInfo(reader->m_lastfile).dirPath(true));
@@ -973,7 +973,7 @@ void QTReaderApp::showinfo()
     unsigned long fs, ts, pl;
     if (reader->empty())
     {
-        QMessageBox::information(this, "QTReader", "No file loaded", 1);
+  QMessageBox::information(this, "OpieReader", "No file loaded", 1);
     }
     else
     {
@@ -1020,7 +1020,7 @@ void QTReaderApp::addAnno(const QString& name, const QString& text)
     {
         if (name.isEmpty())
         {
-            QMessageBox::information(this, "QTReader", "Need a name for the bookmark\nPlease try again", 1);
+      QMessageBox::information(this, "OpieReader", "Need a name for the bookmark\nPlease try again", 1);
         }
         else
         {
@@ -1077,7 +1077,7 @@ void QTReaderApp::addanno()
 {
     if (reader->empty())
     {
-        QMessageBox::information(this, "QTReader", "No file loaded", 1);
+  QMessageBox::information(this, "OpieReader", "No file loaded", 1);
     }
     else
     {
@@ -1231,7 +1231,7 @@ void QTReaderApp::do_overlap(const QString& lcn)
         reader->m_overlap = ulcn;
     }
     else
-        QMessageBox::information(this, "QTReader", "Must be a number");
+  QMessageBox::information(this, "OpieReader", "Must be a number");
 }
 
 void QTReaderApp::do_mono(const QString& lcn)
@@ -1246,7 +1246,7 @@ void QTReaderApp::do_mono(const QString& lcn)
         //reader->setmono(true);
     }
     else
-        QMessageBox::information(this, "QTReader", "Must be a number");
+  QMessageBox::information(this, "OpieReader", "Must be a number");
 }
 
 /*
@@ -1418,7 +1418,7 @@ void QTReaderApp::openFile( const DocLnk &f )
     }
   else
     {
-      QMessageBox::information(this, "QTReader", "File does not exist");
+      QMessageBox::information(this, "OpieReader", "File does not exist");
     }
         
 }
@@ -1486,12 +1486,12 @@ void QTReaderApp::clear()
 void QTReaderApp::updateCaption()
 {
     if ( !doc )
-        setCaption( tr("QTReader") );
+  setCaption( tr("OpieReader") );
     else {
         QString s = doc->name();
         if ( s.isEmpty() )
             s = tr( "Unnamed" );
-        setCaption( s + " - " + tr("QTReader") );
+  setCaption( s + " - " + tr("OpieReader") );
     }
 }
 
@@ -1532,7 +1532,7 @@ void QTReaderApp::closeEvent( QCloseEvent *e )
             }
             if (m_fBkmksChanged && pBkmklist != NULL)
             {
-                if (QMessageBox::warning(this, "QTReader", "Save bookmarks?", "Save", "Don't bother") == 0)
+    if (QMessageBox::warning(this, "OpieReader", "Save bookmarks?", "Save", "Don't bother") == 0)
                     savebkmks();
                 delete pBkmklist;
                 pBkmklist = NULL;
@@ -1587,7 +1587,7 @@ void QTReaderApp::listbkmk()
         editorStack->raiseWidget( bkmkselector );
       }
     else
-      QMessageBox::information(this, "QTReader", "No bookmarks in memory");
+      QMessageBox::information(this, "OpieReader", "No bookmarks in memory");
 }
 
 void QTReaderApp::do_autogen()
@@ -1646,7 +1646,7 @@ void QTReaderApp::do_jump(const QString& lcn)
     if (ok)
         reader->locate(ulcn);
     else
-        QMessageBox::information(this, "QTReader", "Must be a number");
+  QMessageBox::information(this, "OpieReader", "Must be a number");
 }
 
 void QTReaderApp::do_regaction()
@@ -1686,7 +1686,7 @@ void QTReaderApp::do_settarget(const QString& _txt)
     {
         m_targetapp = "";
         m_targetmsg = "";
-        QMessageBox::information(this, "QTReader", "Format is\nappname/messagename");
+  QMessageBox::information(this, "OpieReader", "Format is\nappname/messagename");
     }
     else
     {
@@ -1921,7 +1921,7 @@ void QTReaderApp::do_addbkmk(const QString& text)
 {
         if (text.isEmpty())
         {
-          QMessageBox::information(this, "QTReader", "Need a name for the bookmark\nSelect add again", 1);
+    QMessageBox::information(this, "OpieReader", "Need a name for the bookmark\nSelect add again", 1);
         }
         else
         {