[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/libs/webkitkde
From: Urs Wolfer <uwolfer () kde ! org>
Date: 2009-10-04 11:11:17
Message-ID: 1254654677.969238.5294.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1031199 by uwolfer:
* i18n fix
* use QPointer to prevent possible crash
* include cleanup
* 'fix' include guards
M +15 -4 kdelauncher/main.cpp
M +3 -3 part/sslinfodialog_p.h
M +1 -1 part/webkitpart.cpp
M +1 -1 part/webpage.cpp
M +3 -3 part/websslinfo.h
--- trunk/playground/libs/webkitkde/kdelauncher/main.cpp #1031198:1031199
@@ -41,7 +41,6 @@
#include <qwebelement.h>
#endif
-#include <QtGui>
#include <QDebug>
#if QT_VERSION >= 0x040400 && !defined(QT_NO_PRINTER)
#include <QPrintPreviewDialog>
@@ -49,10 +48,22 @@
#include <QtUiTools/QUiLoader>
+#include <QAction>
+#include <QCompleter>
+#include <QDir>
+#include <QFile>
+#include <QInputDialog>
+#include <QLineEdit>
+#include <QMainWindow>
+#include <QMenu>
+#include <QMenuBar>
+#include <QProgressBar>
+#include <QStatusBar>
+#include <QStringListModel>
+#include <QTextStream>
+#include <QToolBar>
+#include <QToolTip>
#include <QVector>
-#include <QTextStream>
-#include <QFile>
-#include <cstdio>
class WebPage : public KWebPage
{
--- trunk/playground/libs/webkitkde/part/sslinfodialog_p.h #1031198:1031199
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _KSSLINFODIALOG_H
-#define _KSSLINFODIALOG_H
+#ifndef SSLINFODIALOG_P_H
+#define SSLINFODIALOG_P_H
#include <kdemacros.h>
@@ -101,4 +101,4 @@
KSslInfoDialogPrivate* const d;
};
-#endif
+#endif // SSLINFODIALOG_P_H
--- trunk/playground/libs/webkitkde/part/webkitpart.cpp #1031198:1031199
@@ -473,7 +473,7 @@
{
WebPage* page = qobject_cast<WebPage*>(d->webView->page());
if (page->isSecurePage()) {
- KSslInfoDialog *dlg = new KSslInfoDialog(0);
+ QPointer<KSslInfoDialog> dlg = new KSslInfoDialog(0);
page->setupSslDialog(*dlg);
dlg->exec();
} else {
--- trunk/playground/libs/webkitkde/part/webpage.cpp #1031198:1031199
@@ -480,7 +480,7 @@
switch (type) {
case QWebPage::NavigationTypeLinkClicked:
message = i18n("<qt>This untrusted page links to<br/><b>%1</b>."
- "<br/>Do you want to follow the link?</qt>").arg(linkUrl.url());
+ "<br/>Do you want to follow the link?</qt>", linkUrl.url());
title = i18n("Security Warning");
buttonText = i18n("Follow");
break;
--- trunk/playground/libs/webkitkde/part/websslinfo.h #1031198:1031199
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*
*/
-#ifndef KWEBPAGESSLINFO_H
-#define KWEBPAGESSLINFO_H
+#ifndef WEBSSLINFO_H
+#define WEBSSLINFO_H
#include <kdemacros.h>
@@ -68,4 +68,4 @@
WebSslInfoPrivate* d;
};
-#endif
+#endif // WEBSSLINFO_H
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic