[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/apps/konqueror
From: Urs Wolfer <uwolfer () kde ! org>
Date: 2008-11-30 12:22:46
Message-ID: 1228047766.667969.20988.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 890815 by uwolfer:
* fix icons
* fix includes
* fix include guards
* fix QString issues
* fix d-ptr
M +1 -1 client/kfmclient.cpp
M +1 -1 kttsplugin/khtmlkttsd.cpp
M +1 -1 remoteencodingplugin/kremoteencodingplugin.desktop
M +3 -3 settings/kio/useragentinfo.h
M +3 -3 settings/kio/useragentselectordlg.h
M +1 -1 settings/konq/kcustommenueditor.cpp
M +1 -1 settings/konq/previews.cpp
M +1 -1 sidebar/konqsidebarplugin.h
M +1 -1 sidebar/trees/init/services/printsystem.desktop
M +1 -1 sidebar/web_module/webmodule_add.desktop
M +1 -1 sidebar/web_module/websidebar.desktop
M +1 -1 src/konqactions.cpp
M +2 -2 src/konqsessiondlg.h
M +1 -3 src/konqsessionmanager.cpp
M +1 -1 src/konqundomanager.cpp
--- trunk/KDE/kdebase/apps/konqueror/client/kfmclient.cpp #890814:890815
@@ -209,7 +209,7 @@
if( urls.count() != 1 )
return true;
url = urls.first();
- mimetype = QString();
+ mimetype.clear();
}
if (mimetype.isEmpty())
mimetype = KMimeType::findByUrl(KUrl(url))->name();
--- trunk/KDE/kdebase/apps/konqueror/kttsplugin/khtmlkttsd.cpp #890814:890815
@@ -23,7 +23,7 @@
#include <kactioncollection.h>
#include <kdebug.h>
#include <khtml_part.h> // this plugin applies to a khtml part
-#include "config-kttsplugin.h"
+#include <config-kttsplugin.h>
#ifdef HAVE_WEBKITKDE
#include <webkitpart.h>
#ifdef HAVE_WEBVIEW
--- trunk/KDE/kdebase/apps/konqueror/remoteencodingplugin/kremoteencodingplugin.desktop \
#890814:890815 @@ -10,7 +10,7 @@
X-KDE-PluginInfo-License=LGPL
X-KDE-PluginInfo-EnabledByDefault=true
X-KDE-ParentApp=konqueror
-Icon=charset
+Icon=character-set
Name=Remote Encoding Plugin
Name[af]=Afgeleë Enkodering Inprop Module
Name[ar]=ملحق الترميز البعيد
--- trunk/KDE/kdebase/apps/konqueror/settings/kio/useragentinfo.h #890814:890815
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef FAKEUAPROVIDER_H
-#define FAKEUAPROVIDER_H
+#ifndef USERAGENTINFO_H
+#define USERAGENTINFO_H
#include <kservice.h>
@@ -55,4 +55,4 @@
bool m_bIsDirty;
};
-#endif // FAKEUAPROVIDER_H
+#endif // USERAGENTINFO_H
--- trunk/KDE/kdebase/apps/konqueror/settings/kio/useragentselectordlg.h \
#890814:890815 @@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef USERAGENTCONFIGDLG_H
-#define USERAGENTCONFIGDLG_H
+#ifndef USERAGENTSELECTORDLG_H
+#define USERAGENTSELECTORDLG_H
// KDE
#include <kdialog.h>
@@ -51,4 +51,4 @@
UserAgentSelectorWidget* m_widget;
};
-#endif // UAGENTPROVIDERDLG_H
+#endif // USERAGENTSELECTORDLG_H
--- trunk/KDE/kdebase/apps/konqueror/settings/konq/kcustommenueditor.cpp \
#890814:890815 @@ -63,7 +63,7 @@
// item names may contain ampersands. To avoid them being converted
// to accelators, replace them with two ampersands.
- serviceName.replace("&", "&&");
+ serviceName.replace('&', "&&");
QPixmap normal = KIconLoader::global()->loadIcon(s->icon(), \
KIconLoader::Small,
0, KIconLoader::DefaultState, QStringList(), 0L, \
true);
--- trunk/KDE/kdebase/apps/konqueror/settings/konq/previews.cpp #890814:890815
@@ -77,7 +77,7 @@
// Listview containing checkboxes for all protocols that support listing
QTreeWidget *listView = new QTreeWidget( this );
- listView->setHeaderLabel( i18nc( "@title:column Header of a colum where the user \
has to select in which protocols he wants to see file previews", "Select Protocols" ) \
); + listView->setHeaderLabel( i18nc( "@title:column Header of a column where the \
user has to select in which protocols he wants to see file previews", "Select \
Protocols" ) ); listView->setRootIsDecorated( false );
QHBoxLayout *hbox = new QHBoxLayout();
--- trunk/KDE/kdebase/apps/konqueror/sidebar/konqsidebarplugin.h #890814:890815
@@ -58,7 +58,7 @@
KComponentData m_parentInstance;
private:
- KonqSidebarPluginPrivate const *d;
+ KonqSidebarPluginPrivate* const d;
Q_SIGNALS:
void requestURL(KUrl&);
--- trunk/KDE/kdebase/apps/konqueror/sidebar/trees/init/services/printsystem.desktop \
#890814:890815 @@ -1,7 +1,7 @@
[Desktop Entry]
Type=Link
URL=print:/
-Icon=printer
+Icon=preferences-desktop-printer
Name=Print System Browser
Name[af]=Drukker Stelsel Blaaier
Name[ar]=متصفح نظام الطباعة
--- trunk/KDE/kdebase/apps/konqueror/sidebar/web_module/webmodule_add.desktop \
#890814:890815 @@ -1,7 +1,7 @@
[Desktop Entry]
Type=Link
URL=
-Icon=www
+Icon=applications-internet
Name=Web SideBar Module
Name[af]=Web kantbalk module
Name[ar]=وحدة الشريط الجانبي للشبكة
--- trunk/KDE/kdebase/apps/konqueror/sidebar/web_module/websidebar.desktop \
#890814:890815 @@ -1,7 +1,7 @@
[Desktop Entry]
Type=Link
URL=
-Icon=www
+Icon=applications-internet
Name=Web SideBar Module
Name[af]=Web kantbalk module
Name[ar]=وحدة الشريط الجانبي للشبكة
--- trunk/KDE/kdebase/apps/konqueror/src/konqactions.cpp #890814:890815
@@ -63,7 +63,7 @@
{
QString text = history[ index ]->title;
text = fm.elidedText(text, Qt::ElideMiddle, fm.maxWidth() * 30);
- text.replace( "&", "&&" );
+ text.replace( '&', "&&" );
const QString iconName = \
KonqPixmapProvider::self()->iconNameFor(history[index]->url); QAction* action = new \
QAction(KIcon(iconName), text, popup); action->setData(index - historyIndex);
--- trunk/KDE/kdebase/apps/konqueror/src/konqsessiondlg.h #890814:890815
@@ -36,7 +36,7 @@
{
Q_OBJECT
public:
- KonqSessionDlg( KonqViewManager *manager, QWidget *parent = 0L );
+ explicit KonqSessionDlg( KonqViewManager *manager, QWidget *parent = 0L );
~KonqSessionDlg();
protected Q_SLOTS:
@@ -57,7 +57,7 @@
{
Q_OBJECT
public:
- KonqNewSessionDlg( QWidget *parent = 0L, QString sessionName = QString() );
+ explicit KonqNewSessionDlg( QWidget *parent = 0L, QString sessionName = \
QString() ); ~KonqNewSessionDlg();
protected Q_SLOTS:
--- trunk/KDE/kdebase/apps/konqueror/src/konqsessionmanager.cpp #890814:890815
@@ -18,18 +18,16 @@
Boston, MA 02110-1301, USA.
*/
-#include "konqmisc.h"
#include "konqsessionmanager.h"
+#include "konqmisc.h"
#include "konqmainwindow.h"
#include "konqsessionmanager_interface.h"
#include "konqsessionmanageradaptor.h"
-#include "konqmainwindow.h"
#include "konqviewmanager.h"
#include "konqsettingsxt.h"
#include <kglobal.h>
#include <kdebug.h>
-#include <kurl.h>
#include <kio/deletejob.h>
#include <kstandarddirs.h>
#include <kvbox.h>
--- trunk/KDE/kdebase/apps/konqueror/src/konqundomanager.cpp #890814:890815
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
+#include "konqundomanager.h"
#include "konqsettingsxt.h"
-#include "konqundomanager.h"
#include "konqcloseditem.h"
#include "konqclosedwindowsmanager.h"
#include <QAction>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic