summaryrefslogtreecommitdiff
path: root/src/mainwindow.h
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-06-02 19:07:49 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-06-02 19:07:49 +0200
commit8361d1cc4e8fe34ba737815b7de5d8e0bf0b34d7 (patch)
tree50fa6564b14cff40946bd1aa8af2c5ec6217e88e /src/mainwindow.h
parentPorting history Ui to KDE.. (diff)
parentMoving guessUrlFromString function to Application class (diff)
downloadrekonq-8361d1cc4e8fe34ba737815b7de5d8e0bf0b34d7.tar.xz
Fixing (again) merge conflicts..
Diffstat (limited to 'src/mainwindow.h')
-rw-r--r--src/mainwindow.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 7d0b2e5c..cc0aa2e8 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -62,7 +62,6 @@ public:
MainWindow();
~MainWindow();
- static KUrl guessUrlFromString(const QString &url);
MainView *mainView() const;
WebView *currentTab() const;
QAction *actionByName(const QString name);