summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-06-14 16:24:51 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-06-14 16:24:51 +0200
commit227a08281fcb644e5dd61bce167b1a2a2899c1f8 (patch)
tree55149f8f0eee01e750aaf0256fb43f802a2991fa
parentCosmetic networkmanager changes (diff)
parentFix forward declaration (diff)
downloadrekonq-227a08281fcb644e5dd61bce167b1a2a2899c1f8.tar.xz
Merge branch 'local-svn'
-rw-r--r--data/rekonq.desktop5
-rw-r--r--src/cookiejar.h1
-rw-r--r--src/kaccessmanager.h2
-rw-r--r--src/mainview.h3
-rw-r--r--src/mainwindow.h1
-rw-r--r--src/networkmanager.h2
-rw-r--r--src/webpage.h7
-rw-r--r--src/webview.h8
8 files changed, 5 insertions, 24 deletions
diff --git a/data/rekonq.desktop b/data/rekonq.desktop
index cfb4dde0..b583dede 100644
--- a/data/rekonq.desktop
+++ b/data/rekonq.desktop
@@ -1,13 +1,18 @@
[Desktop Entry]
Name=rekonq
Name[sv]=Rekonq
+Name[tr]=Rekonq
+Name[x-test]=xxrekonqxx
GenericName=Webkit KDE Browser
+GenericName[de]=Webkit-Browser für KDE
GenericName[et]=KDE Webkiti veebibrauser
GenericName[km]=កម្មវិធី​រុករក​ Webkit KDE
GenericName[pt]=Navegador Web com WebKit
GenericName[pt_BR]=Navegador Webkit do KDE
GenericName[sv]=Webkit webbläsare för KDE
+GenericName[tr]=Webkit KDE Tarayıcı
GenericName[uk]=Переглядач мережі на WebKit для KDE
+GenericName[x-test]=xxWebkit KDE Browserxx
Icon=rekonq
Type=Application
Exec=rekonq %u
diff --git a/src/cookiejar.h b/src/cookiejar.h
index 56adc0b3..5bfe7749 100644
--- a/src/cookiejar.h
+++ b/src/cookiejar.h
@@ -29,7 +29,6 @@
#include <QtNetwork/QNetworkCookieJar>
// Forward Declarations
-class AutoSaver;
class QUrl;
diff --git a/src/kaccessmanager.h b/src/kaccessmanager.h
index 8325c890..ed5c208d 100644
--- a/src/kaccessmanager.h
+++ b/src/kaccessmanager.h
@@ -27,8 +27,6 @@
#include <kdenetwork/knetworkreply.h>
// Forward Declarations
-class QNetworkRequest;
-class QIODevice;
class NetworkAccessManager : public KNetworkAccessManager
diff --git a/src/mainview.h b/src/mainview.h
index dfa498f7..8a8ae3dc 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -31,17 +31,14 @@
#include <KTabWidget>
// Forward Declarations
-class QLineEdit;
class QUrl;
class QWebFrame;
class QLabel;
class KAction;
-class KCompletion;
class KMenu;
class KUrl;
-class HistoryCompletionModel;
class StackedUrlBar;
class TabBar;
class UrlBar;
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 411cbe6c..f1ea3a98 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -40,7 +40,6 @@ class QWebFrame;
class KUrl;
class KAction;
class KActionMenu;
-class KIcon;
class KMenu;
class HistoryMenu;
diff --git a/src/networkmanager.h b/src/networkmanager.h
index 84362d1c..62c01e99 100644
--- a/src/networkmanager.h
+++ b/src/networkmanager.h
@@ -26,8 +26,6 @@
#include <KIO/AccessManager>
// Forward Declarations
-class QNetworkRequest;
-class QIODevice;
using namespace KIO;
diff --git a/src/webpage.h b/src/webpage.h
index 0723cb6d..ac6780ff 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -34,18 +34,11 @@
#include <QWebPage>
// Forward Declarations
-class MainWindow;
-class Application;
-class KActionCollection;
class QWebFrame;
-class QAuthenticator;
-class QMouseEvent;
-class QNetworkProxy;
class QNetworkReply;
-class WebView;
class WebPage : public KWebPage
diff --git a/src/webview.h b/src/webview.h
index b5ffa887..389db154 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -35,16 +35,8 @@
#include <QWebView>
// Forward Declarations
-class MainWindow;
-class Application;
-class KActionCollection;
-class QWebFrame;
-class QAuthenticator;
-class QMouseEvent;
-class QNetworkProxy;
-class QNetworkReply;
class WebPage;