[Piklab-svn] SF.net SVN: piklab:[2911] trunk/piklab_kde4/src

[<az...@us...>]

Revision: 2911
          http://piklab.svn.sourceforge.net/piklab/?rev=2911&view=rev
Author:   azhyd
Date:     2012-06-10 00:56:23 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
fix compilation with KDE

Modified Paths:
--------------
    trunk/piklab_kde4/src/common/common/global.h
    trunk/piklab_kde4/src/common/global/purl.h
    trunk/piklab_kde4/src/common/gui/purl_gui.cpp
    trunk/piklab_kde4/src/libgui/device_gui.cpp
    trunk/piklab_kde4/src/libgui/project.cpp
    trunk/piklab_kde4/src/libgui/toplevel.cpp

Modified: trunk/piklab_kde4/src/common/common/global.h
===================================================================
--- trunk/piklab_kde4/src/common/common/global.h	2012-06-10 00:47:55 UTC (rev 2910)
+++ trunk/piklab_kde4/src/common/common/global.h	2012-06-10 00:56:23 UTC (rev 2911)
@@ -59,8 +59,6 @@
 #  include <kaboutdata.h>
 #  include <kurl.h>
 
-typedef Kurl::List KurlList;
-
 #endif
 
 #if defined(Q_OS_WIN)

Modified: trunk/piklab_kde4/src/common/global/purl.h
===================================================================
--- trunk/piklab_kde4/src/common/global/purl.h	2012-06-10 00:47:55 UTC (rev 2910)
+++ trunk/piklab_kde4/src/common/global/purl.h	2012-06-10 00:56:23 UTC (rev 2911)
@@ -71,7 +71,7 @@
 {
 public:
   Url() {}
-  explicit Url(const KUrl &url) : Base(url) {}
+  Url(const KUrl &url) : Base(url) {}
   // add correct extension if filename has no extension
   Url(const Directory &path, const QString &filename, FileType type);
   Url(const Directory &path, const QString &filepath);

Modified: trunk/piklab_kde4/src/common/gui/purl_gui.cpp
===================================================================
--- trunk/piklab_kde4/src/common/gui/purl_gui.cpp	2012-06-10 00:47:55 UTC (rev 2910)
+++ trunk/piklab_kde4/src/common/gui/purl_gui.cpp	2012-06-10 00:56:23 UTC (rev 2911)
@@ -47,7 +47,7 @@
 PURL::Directory PURL::getExistingDirectory(const QString &startDir, QWidget *widget,
                                            const QString &caption)
 {
-  KURL kurl = KDirSelectDialog::selectDirectory(startDir, false, widget, caption);
+  KUrl kurl = KDirSelectDialog::selectDirectory(startDir, false, widget, caption);
   if ( kurl.isEmpty() ) return Directory();
   return Directory(kurl.path(KUrl::AddTrailingSlash));
 }

Modified: trunk/piklab_kde4/src/libgui/device_gui.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/device_gui.cpp	2012-06-10 00:47:55 UTC (rev 2910)
+++ trunk/piklab_kde4/src/libgui/device_gui.cpp	2012-06-10 00:56:23 UTC (rev 2911)
@@ -409,10 +409,10 @@
 
 PURL::Url findDocumentUrl(const QString &prefix, const QString &baseName)
 {
-  PURL::Url previous = KURL(prefix + baseName + ".pdf");
+  PURL::Url previous = KUrl(prefix + baseName + ".pdf");
   bool previousExists = previous.exists();
   for (uint i=0; i<26; i++) {
-    PURL::Url url = KURL(prefix + baseName + QChar('a' + i) + ".pdf");
+    PURL::Url url = KUrl(prefix + baseName + QChar('a' + i) + ".pdf");
     bool exists = url.exists();
     if ( !exists && previousExists ) return previous;
     previous = url;

Modified: trunk/piklab_kde4/src/libgui/project.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/project.cpp	2012-06-10 00:47:55 UTC (rev 2910)
+++ trunk/piklab_kde4/src/libgui/project.cpp	2012-06-10 00:56:23 UTC (rev 2911)
@@ -206,7 +206,7 @@
   for (QStringList::const_iterator it = list.begin(); it != list.end(); ++it) {
     QStringList slist = QStringList::split(",", *it);
     QStringList::const_iterator sit = slist.begin();
-    KURL& kurl = const_cast<KURL&>(url.kurl());
+    KUrl& kurl = const_cast<KUrl&>(url.kurl());
     if ( sit==slist.end() || (*sit)!=kurl.url() ) continue;
     for (; sit!=slist.end(); ++sit) {
       bool ok;
@@ -220,7 +220,7 @@
 }
 void Project::setBookmarkLines(const PURL::Url &url, const QValueList<uint> &lines)
 {
-  KURL& kurl = const_cast<KURL&>(url.kurl());
+  KUrl& kurl = const_cast<KUrl&>(url.kurl());
   QStringList list = listValues("editors", "bookmarks", QStringList());
   QStringList nlist;
   for (QStringList::const_iterator it = list.begin(); it != list.end(); ++it) {

Modified: trunk/piklab_kde4/src/libgui/toplevel.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/toplevel.cpp	2012-06-10 00:47:55 UTC (rev 2910)
+++ trunk/piklab_kde4/src/libgui/toplevel.cpp	2012-06-10 00:56:23 UTC (rev 2911)
@@ -385,7 +385,7 @@
   updateGUI();
 }
 
-void MainWindow::openRecentFile(const KURL &kurl)
+void MainWindow::openRecentFile(const KUrl &kurl)
 {
   Main::_editorManager->openFile(PURL::Url(kurl));
 }
@@ -868,7 +868,7 @@
   Main::_compileLog->clear();
 }
 
-void MainWindow::openRecentProject(const KURL &url)
+void MainWindow::openRecentProject(const KUrl &url)
 {
   stopOperations();
   Main::_projectManager->openProject(PURL::Url(url));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.