summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Chornoivan <[email protected]>2015-03-19 20:45:10 +0200
committerYuri Chornoivan <[email protected]>2015-03-19 20:45:10 +0200
commitfa3f405bf65ef16220585034586487a64e0d1b8b (patch)
treebb7952a564ba82698730b8ed2d309cb1a0c55e7e
parentc46dea6b5d7b040f8555f1ef183965a3dfda28e1 (diff)
Fix some EBN issues
-rw-r--r--konqueror/sidebar/konqsidebarplugin.h2
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp2
-rw-r--r--konqueror/src/konqmainwindow.cpp2
-rw-r--r--konqueror/src/tests/historymanagertest.cpp2
-rw-r--r--nsplugins/sdk/npfunctions.h2
-rw-r--r--plasma/applets/folderview/folderview.cpp4
-rw-r--r--plasma/applets/folderview/tooltipwidget.h2
7 files changed, 8 insertions, 8 deletions
diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h
index fbd014d..351913a 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -47,7 +47,7 @@ class KonqSidebarModulePrivate;
* This class is exported, make sure you keep BINARY COMPATIBILITY!
* (Alternatively, add a Version key to the plugins desktop file...)
*
- * A plugin can instanciate multiple modules, for various configurations.
+ * A plugin can instantiate multiple modules, for various configurations.
* Example: the dirtree plugin can create a module for "/", a module for $HOME, etc.
*/
class KONQSIDEBARPLUGIN_EXPORT KonqSidebarModule : public QObject
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 4e93a28..52d91ba 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -62,7 +62,7 @@ void Sidebar_Widget::aboutToShowAddMenu()
existingGroups.append(m_buttons[i].configFile->group("Desktop Entry"));
}
- // We need to instanciate all available plugins
+ // We need to instantiate all available plugins
// And since the web module isn't in the default entries at all, we can't just collect
// the plugins there.
const KService::List list = m_moduleManager.availablePlugins();
diff --git a/konqueror/src/konqmainwindow.cpp b/konqueror/src/konqmainwindow.cpp
index ee5fb44..d78a5fb 100644
--- a/konqueror/src/konqmainwindow.cpp
+++ b/konqueror/src/konqmainwindow.cpp
@@ -1333,7 +1333,7 @@ void KonqMainWindow::slotCreateNewWindow( const KUrl &url,
// Make the window open properties configurable. This is equivalent to
// Firefox's "dom.disable_window_open_feature.*" properties. For now
- // only LocationBar visiblity is configurable.
+ // only LocationBar visibility is configurable.
KSharedConfig::Ptr config = KGlobal::config();
KConfigGroup cfg (config, "DisableWindowOpenFeatures");
diff --git a/konqueror/src/tests/historymanagertest.cpp b/konqueror/src/tests/historymanagertest.cpp
index 160958a..e27ec00 100644
--- a/konqueror/src/tests/historymanagertest.cpp
+++ b/konqueror/src/tests/historymanagertest.cpp
@@ -35,7 +35,7 @@ void HistoryManagerTest::testGetSetMaxCount()
mgr.emitSetMaxCount( 4242 );
QTest::qWait( 100 ); // ### fragile. We have no signal to wait for, so we must just wait a little bit...
// Yes this is just a set+get test, but given that it goes via DBUS before changing the member variable
- // we do test quite a lot with it. We can't really instanciate two KonqHistoryManagers (same dbus path),
+ // we do test quite a lot with it. We can't really instantiate two KonqHistoryManagers (same dbus path),
// so we'd need two processes to test the dbus signal 'for real', if the setter changed the member var...
QCOMPARE( mgr.maxCount(), 4242 );
mgr.emitSetMaxCount( oldMaxCount );
diff --git a/nsplugins/sdk/npfunctions.h b/nsplugins/sdk/npfunctions.h
index ec97a52..9739d18 100644
--- a/nsplugins/sdk/npfunctions.h
+++ b/nsplugins/sdk/npfunctions.h
@@ -215,7 +215,7 @@ typedef struct _NPNetscapeFuncs {
#ifdef XP_MACOSX
/*
* Mac OS X version(s) of NP_GetMIMEDescription(const char *)
- * These can be called to retreive MIME information from the plugin dynamically
+ * These can be called to retrieve MIME information from the plugin dynamically
*
* Note: For compatibility with Quicktime, BPSupportedMIMEtypes is another way
* to get mime info from the plugin only on OSX and may not be supported
diff --git a/plasma/applets/folderview/folderview.cpp b/plasma/applets/folderview/folderview.cpp
index 002401a..23cac19 100644
--- a/plasma/applets/folderview/folderview.cpp
+++ b/plasma/applets/folderview/folderview.cpp
@@ -1272,7 +1272,7 @@ void FolderView::constraintsEvent(Plasma::Constraints constraints)
// if we're coming out of an iconified state, let's reset to a reasonable sane state
// NOTE: usually one NEVER resizes outside of the constructor as that overrides the
// user settings, but in this case we are changing applet state completely and there
- // is no user state for size in that case for folderview (by defintion)
+ // is no user state for size in that case for folderview (by definition)
resize(600, 400);
}
setAspectRatioMode(Plasma::IgnoreAspectRatio);
@@ -1737,7 +1737,7 @@ QList<QAction*> FolderView::contextualActions()
KFileItemListProperties itemList(KFileItemList() << item);
m_itemActions->setItemListProperties(itemList);
- // FIXME: The actions instanciated by KFileItemActions::preferredOpenWithAction()
+ // FIXME: The actions instantiated by KFileItemActions::preferredOpenWithAction()
// (see below) are eventually deleted in its constructor, but it would be better
// to find a way to not keep them around rather than just to hide them.
if (m_openWithAction) {
diff --git a/plasma/applets/folderview/tooltipwidget.h b/plasma/applets/folderview/tooltipwidget.h
index eb136f9..4a14ae0 100644
--- a/plasma/applets/folderview/tooltipwidget.h
+++ b/plasma/applets/folderview/tooltipwidget.h
@@ -38,7 +38,7 @@ class AbstractItemView;
* in the view and resized to the size of the hovered item, so that the tooltip
* will be positioned correctly when it's shown.
*
- * It is also responsible for starting preview jobs and updating the the tooltip
+ * It is also responsible for starting preview jobs and updating the tooltip
* contents when a preview has been generated.
*
* While the widget is created as a child widget of the view, it is always hidden.