4 files changed, 7 insertions, 14 deletions

diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index 21aa0a4..f05b91b 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -80,17 +80,18 @@ bool KApplication::convert2latin1(QString fileName)
     text = ts.read();
     file.close();  
     if (!file.open( IO_WriteOnly ) ) {
         return false;
     }
     QTextStream tsIn( &file );
     tsIn.setEncoding( QTextStream::Latin1 );
     tsIn << text.latin1();
-    file.close();  
+    file.close(); 
+    return true; 
  
 
 }
 void KApplication::showText(QString caption, QString text)
 {
     QDialog dia( 0, "name", true ); ;
     dia.setCaption( caption );
     QVBoxLayout* lay = new QVBoxLayout( &dia );
diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp
index 1394154..6d0475a 100644
--- a/microkde/kdecore/klibloader.cpp
+++ b/microkde/kdecore/klibloader.cpp
@@ -491,27 +491,19 @@ KLibrary* KLibLoader::library( const char *name )
 #else
       QLibrary *qlib = new QLibrary( libfile.latin1(), QLibrary::Immediately );
 #endif
         
 //US      lt_dlhandle handle = lt_dlopen( libfile.latin1() );
 //US      if ( !handle )
       if ( !qlib )
       {
-//US        const char* errmsg = lt_dlerror();
-        char* errmsg;
-        sprintf(errmsg, "KLibLoader::library could not load library: %s", libfile.latin1());
-        qDebug(errmsg);
-        
-        if(errmsg)
-            d->errorMessage = QString::fromLatin1(errmsg);
-        else
-            d->errorMessage = QString::null;
-        kdWarning(150) << "library=" << name << ": file=" << libfile << ": " << d->errorMessage << endl;
-        return 0;
+          qDebug( "KLibLoader::library could not load library: %s", libfile.latin1());
+          d->errorMessage = QString::null;
+          return 0;
       }
       else
         d->errorMessage = QString::null;
 
       KLibrary *lib = new KLibrary( name, libfile, qlib );
       wrap = new KLibWrapPrivate(lib, qlib);
       d->loaded_stack.prepend(wrap);
     }
diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp
index 1ad1728..09ad0c8 100644
--- a/microkde/kdeui/ktoolbar.cpp
+++ b/microkde/kdeui/ktoolbar.cpp
@@ -873,17 +873,17 @@ void KToolBar::setBarPos (BarPosition bpos)
 {
     if ( !mainWindow() )
         return;
 //US    mainWindow()->moveDockWindow( this, (Dock)bpos );
     mainWindow()->moveToolBar( this, (QMainWindow::ToolBarDock)bpos );
 }
 
 
-KToolBar::BarPosition KToolBar::barPos()
+KToolBar::BarPosition KToolBar::barPos() const
 {
     if ( !(QMainWindow*)mainWindow() )
         return KToolBar::Top;
 //US    Dock dock;
     QMainWindow::ToolBarDock dock;
     int dm1, dm2;
     bool dm3;
     ((QMainWindow*)mainWindow())->getLocation( (QToolBar*)this, dock, dm1, dm3, dm2 );
diff --git a/microkde/kdeui/ktoolbar.h b/microkde/kdeui/ktoolbar.h
index 61b5ea3..49ff856 100644
--- a/microkde/kdeui/ktoolbar.h
+++ b/microkde/kdeui/ktoolbar.h
@@ -741,17 +741,17 @@ public:
    * Set position of toolbar.
    * @see BarPosition()
    */
     void setBarPos (BarPosition bpos);
 
     /**
    * Returns position of toolbar.
    */
-    BarPosition barPos();
+    BarPosition barPos() const;
 
   /**
    * @deprecated
    * Show, hide, or toggle toolbar.
    *
    * This method is provided for compatibility only,
    * please use show() and/or hide() instead.
    * @see BarStatus