[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [rekonq/frameworks] src: Others 3 small porting code fixes...
From: Andrea Diamantini <adjam7 () gmail ! com>
Date: 2014-07-14 22:06:52
Message-ID: E1X6oOa-0006y5-1b () scm ! kde ! org
[Download RAW message or body]
Git commit 335c4ec0581555330f5f1f2b41bac35351c434c8 by Andrea Diamantini.
Committed on 14/07/2014 at 22:07.
Pushed by adjam into branch 'frameworks'.
Others 3 small porting code fixes...
M +0 -1 src/searchengine.cpp
M +0 -1 src/tabwindow/tabwidget.cpp
M +5 -7 src/webtab/protocolhandler.cpp
http://commits.kde.org/rekonq/335c4ec0581555330f5f1f2b41bac35351c434c8
diff --git a/src/searchengine.cpp b/src/searchengine.cpp
index 424a71b..c00344d 100644
--- a/src/searchengine.cpp
+++ b/src/searchengine.cpp
@@ -56,7 +56,6 @@ Q_GLOBAL_STATIC(SearchEnginePrivate, d)
void SearchEngine::reload()
{
- // FIXME Easier find path...
KSharedConfig::Ptr config = KSharedConfig::openConfig( QL1S("kuriikwsfilterrc"), \
KConfig::NoGlobals ); KConfigGroup cg = config->group( QL1S("General") );
diff --git a/src/tabwindow/tabwidget.cpp b/src/tabwindow/tabwidget.cpp
index 3200b95..449f998 100644
--- a/src/tabwindow/tabwidget.cpp
+++ b/src/tabwindow/tabwidget.cpp
@@ -125,7 +125,6 @@ void TabWidget::init()
// connecting tabbar signals
connect(tabBar, SIGNAL(tabCloseRequested(int)), this, \
SLOT(closeTab(int)));
-// FIXME What about this? connect(tabBar, SIGNAL(mouseMiddleClick(int)), this, \
SLOT(closeTab(int)));
connect(tabBar, SIGNAL(tabBarDoubleClicked(int)), this, SLOT(openTab(int)));
diff --git a/src/webtab/protocolhandler.cpp b/src/webtab/protocolhandler.cpp
index 551db49..2352984 100644
--- a/src/webtab/protocolhandler.cpp
+++ b/src/webtab/protocolhandler.cpp
@@ -343,13 +343,11 @@ QString ProtocolHandler::dirHandling(const KFileItemList &list)
QString msg = i18nc("%1=an URL", "<h2>Index of %1</h2>", _url.url());
- if (true) // FIXME rootUrl.cd(".."))
- {
- QString path = rootUrl.url();
- QString uparrow = KIconLoader::global()->iconPath( QL1S("arrow-up"), \
KIconLoader::Small);
- msg += QL1S("<img src=\"file://") + uparrow + QL1S("\" alt=\"up-arrow\" \
/>");
- msg += QL1S("<a href=\"") + path + QL1S("\">") + i18n("Up to higher level \
directory") + QL1S("</a><br /><br />");
- }
+ QString path = rootUrl.resolved(QUrl(QL1S(".."))).toString();
+ QString uparrow = KIconLoader::global()->iconPath( QL1S("arrow-up"), \
KIconLoader::Small); + msg += QL1S("<img src=\"file://") + uparrow + QL1S("\" \
alt=\"up-arrow\" />"); + msg += QL1S("<a href=\"") + path + QL1S("\">") + \
i18n("Up to higher level directory") + QL1S("</a><br /><br />"); +
msg += QL1S("<table width=\"95%\" align=\"center\">");
msg += QL1S("<tr>");
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic