Commit 0c46e041 authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Fix typos

parent 0269e4c2
......@@ -114,7 +114,7 @@ public:
Q_SCRIPTABLE virtual QString prettyFileName(KUrl url, FormattingOptions format = FormatHtml) const = 0;
/**
* @returns wether project files should be parsed or not
* @returns whether project files should be parsed or not
*/
static bool parseAllProjectSources();
......
......@@ -95,7 +95,7 @@ Type=QStringList
[PropertyDef::X-KDevelop-Language]
Type=QString
# optional, defines wether the plugin can be disabled
# optional, defines whether the plugin can be disabled
# by the user. Possible values are "AlwaysOn" and "UserSelectable".
# If the property is missing then UserSelectable is assumed
[PropertyDef::X-KDevelop-LoadMode]
......
......@@ -104,7 +104,7 @@ public:
virtual KIcon icon() const = 0;
/**
* Check wether this launch configuration type can launch the given project item
* Check whether this launch configuration type can launch the given project item
* @param item the project tree item to test
* @returns true if this configuration type can launch the given item, false otherwise
*/
......@@ -127,7 +127,7 @@ public:
const QStringList &args ) const = 0;
/**
* Check wether this launch configuration type can launch the given file
* Check whether this launch configuration type can launch the given file
* @param file the file to test launchability
* @returns true if this configuration type can launch the given file, false otherwise
*/
......
......@@ -207,7 +207,7 @@ public:
bool holdingRevision(qint64 revision) const;
/**
* Use this fuction to acquire a revision. As long as the returned object is stored somewhere,
* Use this function to acquire a revision. As long as the returned object is stored somewhere,
* the revision can be used for transformations in MovingInterface, and especially for
* DocumentChangeTracker::transformBetweenRevisions.
*
......
......@@ -76,7 +76,7 @@ class KDEVPLATFORMLANGUAGE_EXPORT CodeCompletionWorker : public QObject
protected:
virtual void computeCompletions(DUContextPointer context, const KTextEditor::Cursor& position, QString followingText, const KTextEditor::Range& contextRange, const QString& contextText);
///This can be overriden to compute an own grouping in the completion-list.
///This can be overridden to compute an own grouping in the completion-list.
///The default implementation groups items in a way that improves the efficiency of the completion-model, thus the default-implementation should be preferred.
virtual QList<KSharedPtr<CompletionTreeElement> > computeGroups(QList<CompletionTreeItemPointer> items, KSharedPtr<CodeCompletionContext> completionContext);
///If you don't need to reimplement computeCompletions, you can implement only this.
......
......@@ -60,7 +60,7 @@ class TemplateRenderer;
*
* For each file name in the @c Files array, TemplateClassGenerator expects a section with the same name.
* this section should contain three keys:
* @li @c Name - User-visible name for this file. This will be show the the user in the dialog and can be translated.
* @li @c Name - User-visible name for this file. This will be show the user in the dialog and can be translated.
* @li @c File - The input file name in the template archive. The template for this file will be read from here.
* @li @c OutputFile - The suggested output file name. This will be renderer as a template, so it can contain variables.
*
......
......@@ -57,7 +57,7 @@ class DocumentChangeSet;
* directories or archive files to the list of files search for inclusion.
*
* Directories named "kdevcodegen/templates" in the "data" resource type are always included in the search path,
* there is no need to add them explicitely. Additionally, TemplateRenderer adds the "lib" resource directories
* there is no need to add them explicitly. Additionally, TemplateRenderer adds the "lib" resource directories
* to the Grantlee plugin search path, so plugins installed there will be available to templates.
*
**/
......@@ -181,7 +181,7 @@ public:
*
* As their name suggests, @c output_file_x contains the relative path from baseUrl() to the URL of the
* x's output location, while @c output_file_x_absolute contains x's absolute output URL.
* Both are avaliable to templates as strings.
* Both are available to templates as strings.
*
* @param fileTemplate the source file template to render
* @param baseUrl the base URL used for calculating relative output file URLs
......
......@@ -222,7 +222,7 @@ inline bool satisfied(TopDUContext::Features features, TopDUContext::Features re
return (features & required) == required;
}
///Makes sure the the file has the correct features attached, and if minimumFeatures contains AllDeclarationsContextsAndUsesForRecursive, then also checks all imports.
///Makes sure the file has the correct features attached, and if minimumFeatures contains AllDeclarationsContextsAndUsesForRecursive, then also checks all imports.
bool ParsingEnvironmentFile::featuresMatch(TopDUContext::Features minimumFeatures, QSet<const ParsingEnvironmentFile*>& checked) const {
if(checked.contains(this))
......
......@@ -541,7 +541,7 @@ void TestDUChain::testImportStructure()
QList<TestContext*> allContexts;
//Create a random structure
int contextCount = 50;
int verifyOnceIn = contextCount/*((contextCount*contextCount)/20)+1*/; //Verify once in every chances(not in all cases, becase else the import-structure isn't built on-demand!)
int verifyOnceIn = contextCount/*((contextCount*contextCount)/20)+1*/; //Verify once in every chances(not in all cases, because else the import-structure isn't built on-demand!)
int clearOnceIn = contextCount;
for(int a = 0; a < contextCount; a++)
allContexts << new TestContext();
......
......@@ -28,7 +28,7 @@ namespace KDevelop {
*
* In KDevelop, this object is used when referencing a cursor that does _not_ point into the
* most most current document revision. Therefore, before applying such a cursor in the text
* documents, it has to be translated into the current document revision explicity, thereby replaying
* documents, it has to be translated into the current document revision explicitly, thereby replaying
* eventual changes (see DUChainBase::translate...)
*/
......
......@@ -29,7 +29,7 @@ namespace KDevelop {
*
* In KDevelop, this object is used when referencing a ranges that do _not_ point into the
* most most current document revision. Therefore, before applying such a range in the text
* documents, it has to be translated into the current document revision explicity, thereby replaying
* documents, it has to be translated into the current document revision explicitly, thereby replaying
* eventual changes (see DUChainBase::translate...)
*/
......
......@@ -98,7 +98,7 @@ class KDEVPLATFORMLANGUAGE_EXPORT ColorCache : public QObject
void colorsGotChanged();
private slots:
/// if neccessary, adapt to the colors of this document
/// if necessary, adapt to the colors of this document
void slotDocumentActivated(KDevelop::IDocument*);
/// settings got changed, update to the settings of the sender
void slotViewSettingsChanged();
......@@ -125,7 +125,7 @@ class KDEVPLATFORMLANGUAGE_EXPORT ColorCache : public QObject
void update();
/// try to access the KatePart settings for the given doc or fallback to the global KDE scheme
/// and update the colors if neccessary
/// and update the colors if necessary
/// @see generateColors(), updateColorsFromScheme()
void updateColorsFromDocument(KTextEditor::Document* doc);
......
......@@ -119,7 +119,7 @@ public:
* - The default "Insensitive" will only schedule a document for reparsing when
* a change in a non-whitespace area happens (non-whitespace chars added or whitespace
* added where it was surrounded by characters)
* - "IndentOnly" will additionaly schedule the document for reparsing if a whitespace
* - "IndentOnly" will additionally schedule the document for reparsing if a whitespace
* change occurs at the beginning of the line (more exactly, if all characters before the
* changed ones are whitespace)
* - "Sensitive" will always schedule the document for reparsing, no matter what was changed.
......
......@@ -208,7 +208,7 @@ public:
virtual ~ClassNode();
/// Lookup a contained class and return the related node.
/// @return the the node pointer or 0 if non was found.
/// @return the node pointer or 0 if non was found.
ClassNode* findSubClass(const KDevelop::IndexedQualifiedIdentifier& a_id);
public: // Node overrides
......
......@@ -607,7 +607,7 @@ void ContextBrowserPlugin::updateForView(View* view)
if(view->selection())
{
// If something is selected, we unhighlight everything, so that we don't conflict with the
// kate plugin that highlights occurences of the selected string, and also to reduce the
// kate plugin that highlights occurrences of the selected string, and also to reduce the
// overall amount of concurrent highlighting.
allowHighlight = false;
}
......
......@@ -34,7 +34,7 @@ The CVS plugin is separated into three part.
similar actions get executed would be an overkill. Therefore
CvsMainView also provides a generic output view that just displays
the plain text output from such jobs. Unlike custom views, this
generic view can not be closed and it will simply append the ouput
generic view can not be closed and it will simply append the output
from each job that got connected to it.
......@@ -50,7 +50,7 @@ The workflow of the CVS plugin looks like this:
returns a pointer to the CvsJobs object
6) CvsPart calls start() for the returned CvsJob object and continues
with either #6.1 or #6.2
6.1) Connectes the job's result() signal to the generic ouput view
6.1) Connectes the job's result() signal to the generic output view
from CvsMainView
6.2) Creates a custom view, connects the job's result() signal to it
and adds the view to CvsMainView
......
......@@ -235,8 +235,8 @@ FileTemplatesPlugin::TemplateType FileTemplatesPlugin::determineTemplateType(con
* all the files in the directory are template files.
*
* On the other hand, file templates use the generic suffix ".desktop".
* Fortunately, those explicitely list input and output files, so we
* only match the explicitely listed files
* Fortunately, those explicitly list input and output files, so we
* only match the explicitly listed files
*/
if (entry.endsWith(".kdevtemplate"))
{
......
......@@ -29,7 +29,7 @@ class QTreeWidgetItem;
namespace KDevelop {
/**
* Assistant page for choosing class functions, overriden from base classes.
* Assistant page for choosing class functions, overridden from base classes.
*/
class OverridesPage : public QWidget
{
......@@ -44,7 +44,7 @@ public:
* Calls @c addPotentialOverride() on each function, where more filtering can be applied.
*
* @param directBases Declarations of base classes from which the new class inherits directly.
* @param allBases Declarations of all base classes from which functions can be overriden
* @param allBases Declarations of all base classes from which functions can be overridden
*/
virtual void addBaseClasses(const QList<DeclarationPointer>& directBases,
const QList<DeclarationPointer>& allBases);
......@@ -67,7 +67,7 @@ public:
* The DUChain must be locked for reading before calling this function
*
* @param category the user-visible category name
* @param declarations a list of declarations that can be overriden or implemented in the new class
* @param declarations a list of declarations that can be overridden or implemented in the new class
*/
void addCustomDeclarations(const QString& category, const QList< KDevelop::DeclarationPointer >& declarations);
......
......@@ -170,7 +170,7 @@ void TemplateClassAssistantPrivate::addFilesToTarget (const QHash< QString, KUrl
if (targets.isEmpty())
{
// If no target was explicitely found yet, try all the targets in the current folder
// If no target was explicitly found yet, try all the targets in the current folder
foreach (ProjectBaseItem* item, items)
{
targets << item->targetList();
......
......@@ -131,7 +131,7 @@ void TemplateSelectionPagePrivate::previewTemplate(const QString& file)
preview->document()->openUrl(fileUrls.value(out.identifier));
++idx;
}
// remove superflous tabs from last time
// remove superfluous tabs from last time
while (ui->tabWidget->count() > fileUrls.size()) {
delete ui->tabWidget->widget(fileUrls.size());
}
......
......@@ -142,7 +142,7 @@ QString revisionInterval(const KDevelop::VcsRevision& rev, const KDevelop::VcsRe
{
QString ret;
if(rev.revisionType()==VcsRevision::Special &&
rev.revisionValue().value<VcsRevision::RevisionSpecialType>()==VcsRevision::Start) //if we want it to the begining just put the revisionInterval
rev.revisionValue().value<VcsRevision::RevisionSpecialType>()==VcsRevision::Start) //if we want it to the beginning just put the revisionInterval
ret = toRevisionName(limit, QString());
else {
QString dst = toRevisionName(limit);
......
......@@ -91,7 +91,7 @@ void GitInitTest::repoInit()
//and for non-git dir, I hope nobody has /tmp under git
QVERIFY(!m_plugin->isValidDirectory(KUrl("/tmp")));
//we have nothing, so ouput should be empty
//we have nothing, so output should be empty
DVcsJob * j2 = m_plugin->gitRevParse(gitRepo, QStringList(QString("--branches")));
QVERIFY(j2);
QVERIFY(j2->exec());
......@@ -177,7 +177,7 @@ void GitInitTest::commitFiles()
j = m_plugin->status(KUrl::List(gitTest_BaseDir));
VERIFYJOB(j);
//since we commited the file to the "pure" repository, .git/refs/heads/master should exist
//since we committed the file to the "pure" repository, .git/refs/heads/master should exist
//TODO: maybe other method should be used
QString headRefName(gitRepo + "/refs/heads/master");
QVERIFY(QFileInfo(headRefName).exists());
......
......@@ -20,7 +20,7 @@ class QComboBox;
/// Returns the contents of a QComboBox as a QStringList
QStringList qCombo2StringList( QComboBox* combo, bool allowEmpty = false );
/// Replaces each occurence of "%s" in pattern by searchString (and "%%" by "%")
/// Replaces each occurrence of "%s" in pattern by searchString (and "%%" by "%")
QString substitudePattern(const QString& pattern, const QString& searchString);
#endif
......@@ -109,7 +109,7 @@ public:
/**
* @p oldlines - lines that were removed.
* @p newLines - lines that were inserted.
* @p startPos - number of line at which the change occured
* @p startPos - number of line at which the change occurred
*/
QPair<QList<Difference*>, QList<Difference*> > linesChanged(const QStringList& oldLines, const QStringList& newLines, int editLineNumber);
......
......@@ -315,7 +315,7 @@ bool KompareModelList::saveDestination( DiffModel* model )
{
kDebug(8101) << "KompareModelList::saveDestination: " << endl;
// Unecessary safety check, we can guarantee there are unsaved changes!!!
// Unnecessary safety check, we can guarantee there are unsaved changes!!!
if( !model->hasUnsavedChanges() )
return true;
......
......@@ -234,7 +234,7 @@ public:
*
* @param targets targets to lock
* @param force force setting/stealing lock
* @param comment writing comment about lock setting is neccessary
* @param comment writing comment about lock setting is necessary
* @exception ClientException
*/
void
......
......@@ -137,7 +137,7 @@ public:
svn_config_ensure(c_configDir, pool);
// intialize authentication providers
// initialize authentication providers
// * simple
// * username
// * simple prompt
......
......@@ -42,7 +42,7 @@ namespace svn
Entry::~Entry()
{
// no need to explicitely de-allocate m_entry
// no need to explicitly de-allocate m_entry
// since this will be handled by m_pool
}
......
......@@ -113,7 +113,7 @@ namespace svn
const char *
lastChangedAuthor() const;
/** @return wether the info contains working copy stuff */
/** @return whether the info contains working copy stuff */
bool
hasWcInfo () const;
......
......@@ -63,7 +63,7 @@ using namespace KDevelop;
void validatingExecJob(VcsJob* j, VcsJob::JobStatus status = VcsJob::JobSucceeded)
{
QVERIFY(j);
// Print the commmands in full, for easier bug location
// Print the commands in full, for easier bug location
#if 0
if (QLatin1String(j->metaObject()->className()) == "DVcsJob") {
kDebug() << "Command: \"" << ((DVcsJob*)j)->getChildproc()->program() << ((DVcsJob*)j)->getChildproc()->workingDirectory();
......
......@@ -200,7 +200,7 @@ KIcon TestView::iconForTestResult(TestResult::TestCaseResult result)
return KIcon("dialog-ok-apply");
case TestResult::UnexpectedPass:
// This is a very rare occurence, so the icon should stand out
// This is a very rare occurrence, so the icon should stand out
return KIcon("dialog-warning");
case TestResult::Failed:
......
......@@ -212,7 +212,7 @@ class KDEVPLATFORMPROJECT_EXPORT ProjectBaseItem
/**
* Renames the item to the new name.
* @returns status information wether the renaming succeeded.
* @returns status information whether the renaming succeeded.
*/
virtual RenameStatus rename( const QString& newname );
......
......@@ -51,7 +51,7 @@ AreaDisplay::AreaDisplay(KDevelop::MainWindow* parent)
m_button = new QToolButton(this);
m_button->setToolTip(i18n(
"Execute actions to change the area.<br />"
"An area is a a toolview configuration for a specific use case. "
"An area is a toolview configuration for a specific use case. "
"From here you can also navigate back to the default code area."));
m_button->setAutoRaise(true);
m_button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
......
......@@ -405,13 +405,13 @@ void DebugController::updateDebuggerState(IDebugSession::DebuggerState state, ID
case IDebugSession::StoppingState:
kDebug() << "new state: stopped";
stateChanged("stopped");
//m_restartDebugger->setEnabled(session->restartAvaliable());
//m_restartDebugger->setEnabled(session->restartAvailable());
break;
case IDebugSession::StartingState:
case IDebugSession::PausedState:
kDebug() << "new state: paused";
stateChanged("paused");
//m_restartDebugger->setEnabled(session->restartAvaliable());
//m_restartDebugger->setEnabled(session->restartAvailable());
break;
case IDebugSession::ActiveState:
kDebug() << "new state: active";
......
......@@ -91,7 +91,7 @@ QWidget* createNavPart(QWidget* parent, KParts::Part* part)
QWidget* PatchDocument::createViewWidget(QWidget* parent)
{
//Overriden so that we don't get openUrl triggered by createPart
//Overridden so that we don't get openUrl triggered by createPart
KParts::Part *part = Core::self()->partControllerInternal()->createPart("text/x-patch", "Kompare/ViewPart");
if( part )
{
......
......@@ -175,7 +175,7 @@ public:
ILauncher* launcher = 0;
foreach (ILauncher *l, type->launchers())
{
//kDebug() << "avaliable launcher" << l << l->id() << l->supportedModes();
//kDebug() << "available launcher" << l << l->id() << l->supportedModes();
if (l->supportedModes().contains(mode->id())) {
launcher = l;
break;
......@@ -188,7 +188,7 @@ public:
foreach (LaunchConfiguration *l, launchConfigurations) {
QStringList path = l->config().readEntry(ConfiguredFromProjectItemEntry, QStringList());
if (l->type() == type && path == itemPath) {
kDebug() << "allready generated ilaunch" << path;
kDebug() << "already generated ilaunch" << path;
ilaunch = l;
break;
}
......
......@@ -306,7 +306,7 @@ void ProjectControllerTest::openMultiple()
rootItem = i->folder();\
} void(0)
/*! Verify that the the projectitem @p item has a single child item
/*! Verify that the projectitem @p item has a single child item
* named @p name with url @p url. @p subFolder is an output parameter
* that contains the sub-folder projectitem. */
#define ASSERT_SINGLE_SUBFOLDER_IN(item, name, url__, subFolder) \
......
......@@ -300,7 +300,7 @@ void WorkingSetToolTipWidget::updateFileButtons()
(*it)->m_label->setIsActiveFile(it.key() == activeFile);
}
// NOTE: allways hide merge&subtract all on current working set
// NOTE: always hide merge&subtract all on current working set
// if we want to enable mergeButton, we have to fix it's behavior since it operates directly on the
// set contents and not on the m_fileWidgets
m_mergeButton->setHidden(allOpen || currentWorkingSet == m_set);
......
......@@ -568,7 +568,7 @@ void AreaOperationTest::splitViewActiveTabsTest()
// at first show of the area, the active view should be m_pView111
QCOMPARE(mw.activeView(), m_pView111);
// Try to get to the the main container :
// Try to get to the main container :
// get the central widget
QWidget *pCentral = mw.centralWidget();
QVERIFY(pCentral);
......
......@@ -33,7 +33,7 @@ class EnvironmentSelectionWidgetPrivate
EnvironmentSelectionWidget::EnvironmentSelectionWidget( QWidget *parent )
: KComboBox( parent ), d( new EnvironmentSelectionWidgetPrivate )
{
// Taken from kdelibs/kdeui/dialogs/kconfigdialogmanager.cpp (no idea wether this is documented)
// Taken from kdelibs/kdeui/dialogs/kconfigdialogmanager.cpp (no idea whether this is documented)
// Commits d44186bce4670d2985fb6aba8dba59bbd2c4c77a and 8edc1932ecc62370d9a31836dfa9b2bd0175a293
// introduced a regression in kdelibs to fix problems running some apps against Qt4.8. Unfortunately
// this fix breaks exactly our use-case, which is to store the text-value in kconfig instead of
......
......@@ -608,7 +608,7 @@ class dense_hashtable {
const size_type target =
static_cast<size_type>(settings.shrink_size(resize_to*2));
if (num_elements - num_deleted + delta >= target) {
// Good, we won't be below the shrink threshhold even if we double.
// Good, we won't be below the shrink threshold even if we double.
resize_to *= 2;
}
}
......
......@@ -313,7 +313,7 @@ class sh_hashtable_settings : public HashFunc {
set_consider_shrink(false);
}
// Caller is resposible for calling reset_threshold right after
// Caller is responsible for calling reset_threshold right after
// set_resizing_parameters.
void set_resizing_parameters(float shrink, float grow) {
assert(shrink >= 0.0);
......
......@@ -647,7 +647,7 @@ class sparse_hashtable {
const size_type target =
static_cast<size_type>(settings.shrink_size(resize_to*2));
if (table.num_nonempty() - num_deleted + delta >= target) {
// Good, we won't be below the shrink threshhold even if we double.
// Good, we won't be below the shrink threshold even if we double.
resize_to *= 2;
}
}
......
......@@ -36,7 +36,7 @@
// any changes here, make sure that you're not breaking any platforms.
//
//
// The names choosen here reflect those used in tr1 and the boost::mpl
// The names chosen here reflect those used in tr1 and the boost::mpl
// library, there are similar operations used in the Loki library as
// well. I prefer the boost names for 2 reasons:
// 1. I think that portions of the Boost libraries are more likely to
......
......@@ -29,7 +29,7 @@ class QString;
namespace KDevelop {
/**
* Asks user of an arbitary question by using either a \ref KMessageBox or stdin/stderr.
* Asks user of an arbitrary question by using either a \ref KMessageBox or stdin/stderr.
*
* @return @c true if user chose "Yes" and @c false otherwise.
*/
......
......@@ -85,7 +85,7 @@ public:
/**
* When a plugin wants to add elements to the vcs menu, this method can be
* overriden.
* overridden.
*/
virtual void additionalMenuEntries(QMenu* menu, const KUrl::List& urls);
public Q_SLOTS:
......
......@@ -71,7 +71,7 @@ void validatingExecJob(int line, VcsJob* j, VcsJob::JobStatus status = VcsJob::J
{
TRACE("Called from line" << line);
QVERIFY(j);
// Print the commmands in full, for easier bug location
// Print the commands in full, for easier bug location
#if 0
if (QLatin1String(j->metaObject()->className()) == "DVcsJob") {
kDebug() << "Command: \"" << ((DVcsJob*)j)->process()->program() << ((DVcsJob*)j)->process()->workingDirectory();
......
......@@ -43,13 +43,13 @@ public:
virtual QString message() const = 0;
/**
* Check wether the given data is valid.
* Check whether the given data is valid.
* @returns true if all data in the widget is valid
*/
virtual bool hasValidData() const = 0;
/**
* Select wether the widget should re-use the last part of the source location
* Select whether the widget should re-use the last part of the source location
* for the destination. The default implementation simply ignores this setting.
*/
virtual void setUseSourceDirForDestination( bool ) {}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment