[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/konqueror
From:       David Faure <faure () kde ! org>
Date:       2007-04-02 22:58:25
Message-ID: 1175554705.969642.23882.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 649656 by dfaure:

Fix compilation


 M  +9 -9      iconview/konq_iconview.cc  
 M  +1 -1      konq_view.cc  
 M  +1 -1      konq_viewmgr.cc  
 M  +3 -3      listview/konq_listviewwidget.cc  
 M  +1 -1      settings/filetypes/filetypesview.cpp  
 M  +1 -1      sidebar/trees/history_module/history_module.cpp  


--- trunk/KDE/kdebase/konqueror/iconview/konq_iconview.cc #649655:649656
@@ -1207,9 +1207,9 @@
 
 void KonqKfmIconView::slotRedirection( const KUrl & url )
 {
-    const QString prettyURL = url.pathOrUrl();
-    emit m_extension->setLocationBarUrl( prettyURL );
-    emit setWindowCaption( prettyURL );
+    const QString prettyUrl = url.pathOrUrl();
+    emit m_extension->setLocationBarUrl( prettyUrl );
+    emit setWindowCaption( prettyUrl );
     m_pIconView->setUrl( url );
     setUrl(url);
 }
@@ -1347,8 +1347,8 @@
       }
     }
 
-    const QString prettyURL = url.pathOrUrl();
-    emit setWindowCaption( prettyURL );
+    const QString prettyUrl = url.pathOrUrl();
+    emit setWindowCaption( prettyUrl );
 
     return true;
 }
@@ -1512,8 +1512,8 @@
     // Open the folder URL, we don't want to modify the browser
     // history, hence the use of openUrl and setLocationBarURL
     view->openUrl(url);
-    const QString prettyURL = url.pathOrUrl();
-    emit view->extension()->setLocationBarUrl( prettyURL );
+    const QString prettyUrl = url.pathOrUrl();
+    emit view->extension()->setLocationBarUrl( prettyUrl );
 }
 
 void SpringLoadingManager::dragLeft(KonqKfmIconView */*view*/)
@@ -1556,8 +1556,8 @@
 
     KonqKfmIconView *view = static_cast<KonqKfmIconView*>(part);
     view->openUrl(url);
-    const QString prettyURL = url.pathOrUrl();
-    emit view->extension()->setLocationBarUrl( prettyURL );
+    const QString prettyUrl = url.pathOrUrl();
+    emit view->extension()->setLocationBarUrl( prettyUrl );
 
     deleteLater();
     s_self = 0L;
--- trunk/KDE/kdebase/konqueror/konq_view.cc #649655:649656
@@ -899,7 +899,7 @@
         frame()->unsetCursor();
   }
   else if ( run )
-      frame()->setCursor( KCursor::workingCursor() );
+      frame()->setCursor( Qt::BusyCursor );
   m_pRun = run;
 }
 
--- trunk/KDE/kdebase/konqueror/konq_viewmgr.cc #649655:649656
@@ -1553,7 +1553,7 @@
 
       if ( !url.isEmpty() )
       {
-        //kDebug(1202) << "KonqViewManager::loadItem: calling openUrl " << url.prettyURL() << endl;
+        //kDebug(1202) << "KonqViewManager::loadItem: calling openUrl " << url.prettyUrl() << endl;
         //childView->openUrl( url, url.prettyUrl() );
         // We need view-follows-view (for the dirtree, for instance)
         KonqOpenURLRequest req;
--- trunk/KDE/kdebase/konqueror/listview/konq_listviewwidget.cc #649655:649656
@@ -1250,9 +1250,9 @@
       readProtocolConfig( url );
       createColumns();
    }
-   const QString prettyURL = url.pathOrUrl();
-   emit m_pBrowserView->extension()->setLocationBarUrl( prettyURL );
-   emit m_pBrowserView->setWindowCaption( prettyURL );
+   const QString prettyUrl = url.pathOrUrl();
+   emit m_pBrowserView->extension()->setLocationBarUrl( prettyUrl );
+   emit m_pBrowserView->setWindowCaption( prettyUrl );
    m_pBrowserView->setUrl( url );
    m_url = url;
 }
--- trunk/KDE/kdebase/konqueror/settings/filetypes/filetypesview.cpp #649655:649656
@@ -159,7 +159,7 @@
   show();
   setEnabled( false );
 
-  setCursor( KCursor::waitCursor() );
+  setCursor( Qt::WaitCursor );
   readFileTypes();
   unsetCursor();
 
--- trunk/KDE/kdebase/konqueror/sidebar/trees/history_module/history_module.cpp #649655:649656
@@ -143,7 +143,7 @@
 
 void KonqSidebarHistoryModule::slotCreateItems()
 {
-    QApplication::setOverrideCursor( KCursor::waitCursor() );
+    QApplication::setOverrideCursor( Qt::WaitCursor );
     clear();
 
     KonqSidebarHistoryItem *item;
[prev in list] [next in list] [prev in thread] [next in thread]