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
@@ -84,9 +84,10 @@ bool KApplication::convert2latin1(QString fileName)
     }
     QTextStream tsIn( &file );
     tsIn.setEncoding( QTextStream::Latin1 );
     tsIn << text.latin1();
-    file.close();  
+    file.close(); 
+    return true; 
  
 
 }
 void KApplication::showText(QString caption, QString text)
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
@@ -495,19 +495,11 @@ KLibrary* KLibLoader::library( const char *name )
 //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;
 
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
@@ -877,9 +877,9 @@ void KToolBar::setBarPos (BarPosition 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;
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
@@ -745,9 +745,9 @@ public:
 
     /**
    * Returns position of toolbar.
    */
-    BarPosition barPos();
+    BarPosition barPos() const;
 
   /**
    * @deprecated
    * Show, hide, or toggle toolbar.