Merge pull request sqlitebrowser#320 from mafagafogigante/typo-fix

Fixed a typo.
jasonbu · May 20, 2015 · 8823cf8 · 8823cf8
2 parents 97b88fe + 8153df8
commit 8823cf8
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 16 deletions.
diff --git a/src/CipherDialog.cpp b/src/CipherDialog.cpp
@@ -14,7 +14,7 @@ CipherDialog::CipherDialog(QWidget* parent, bool encrypt) :
     {
         ui->labelDialogDescription->setText(tr("Please set a key to encrypt the database.\nNote that if you change any of the other, optional, settings you'll need "
                                                "to re-enter them as well every time you open the database file.\nLeave the password fields empty to disable the "
-                                               "encryption.\nThe encrpytion process might take some time and you should have a backup copy of you database! Unsaved "
+                                               "encryption.\nThe encryption process might take some time and you should have a backup copy of your database! Unsaved "
                                                "changes are applied before modifying the encryption."));
     } else {
         ui->labelDialogDescription->setText(tr("Please enter the key used to encrypt the database.\nIf any of the other settings were altered for this database file "

diff --git a/src/CipherDialog.h b/src/CipherDialog.h
@@ -17,7 +17,7 @@ class CipherDialog : public QDialog
     explicit CipherDialog(QWidget* parent, bool encrypt);
     ~CipherDialog();
 
-    // Allow read access  tothe input fields
+    // Allow read access to the input fields
     QString password() const;
     int pageSize() const;
 

diff --git a/src/EditTableDialog.cpp b/src/EditTableDialog.cpp
@@ -106,7 +106,7 @@ void EditTableDialog::populateFields()
         tbitem->setCheckState(kAutoIncrement, f->autoIncrement() ? Qt::Checked : Qt::Unchecked);
         tbitem->setCheckState(kUnique, f->unique() ? Qt::Checked : Qt::Unchecked);
 
-        // For the default value check if it is surrounded by parantheses and if that's the case
+        // For the default value check if it is surrounded by parentheses and if that's the case
         // add a '=' character before the entire string to match the input format we're expecting
         // from the user when using functions in the default value field.
         if(f->defaultValue().startsWith('(') && f->defaultValue().endsWith(')'))
@@ -548,14 +548,14 @@ void EditTableDialog::setWithoutRowid(bool without_rowid)
 {
     if(without_rowid)
     {
-        // Before setting the without rowid flag, first perform a check to see if the table meets all thr required criteria for without rowid tables
+        // Before setting the without rowid flag, first perform a check to see if the table meets all the required criteria for without rowid tables
         int pk = m_table.findPk();
         if(pk == -1 || m_table.fields().at(pk)->autoIncrement())
         {
             QMessageBox::information(this, QApplication::applicationName(),
                                      tr("Please add a field which meets the following criteria before setting the without rowid flag:\n"
                                         " - Primary key flag set\n"
-                                        " - Auto incremenct disabled"));
+                                        " - Auto increment disabled"));
             ui->checkWithoutRowid->setChecked(false);
             return;
         }

diff --git a/src/ExportSqlDialog.cpp b/src/ExportSqlDialog.cpp
@@ -34,7 +34,7 @@ ExportSqlDialog::ExportSqlDialog(DBBrowserDB* db, QWidget* parent, const QString
     }
 
     // Sort list of tables and select the table specified in the
-    // selection parameter or all tables if table not specifed
+    // selection parameter or all tables if table not specified
     ui->listTables->model()->sort(0);
     if(selection.isEmpty())
     {

diff --git a/src/FilterTableHeader.cpp b/src/FilterTableHeader.cpp
@@ -111,7 +111,7 @@ void FilterTableHeader::adjustPositions()
     // Loop through all widgets
     for(int i=0;i < filterWidgets.size(); ++i)
     {
-        // Get the current widget, move it and reisize it
+        // Get the current widget, move it and resize it
         QWidget* w = filterWidgets.at(i);
         w->move(sectionPosition(i) - offset(), filterWidgets.at(i)->sizeHint().height() + 2);   // The two adds some extra space between the header label and the input widget
         w->resize(sectionSize(i), filterWidgets.at(i)->sizeHint().height());

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -190,7 +190,7 @@ void MainWindow::init()
 #endif
 
 #ifndef ENABLE_SQLCIPHER
-    // Only show encrpytion menu action when SQLCipher support is enabled
+    // Only show encryption menu action when SQLCipher support is enabled
     ui->actionEncryption->setVisible(false);
 #endif
 }
@@ -1263,7 +1263,7 @@ void MainWindow::openSqlFile()
         QFile f(file);
         f.open(QIODevice::ReadOnly);
 
-        // Decide wether to open a new tab or take the current one
+        // Decide whether to open a new tab or take the current one
         unsigned int index;
         SqlExecutionArea* current_tab = qobject_cast<SqlExecutionArea*>(ui->tabSqlAreas->currentWidget());
         if(current_tab->getSql().isEmpty() && current_tab->getModel()->rowCount() == 0)

diff --git a/src/SqlUiLexer.cpp b/src/SqlUiLexer.cpp
@@ -167,7 +167,7 @@ const char* SqlUiLexer::keywords(int set) const
 
 QStringList SqlUiLexer::autoCompletionWordSeparators() const
 {
-    // The only word seperator for auto completion in SQL is "." as in "tablename.columnname".
+    // The only word separator for auto completion in SQL is "." as in "tablename.columnname".
     // Because this isn't implemented in the default QScintilla SQL lexer for some reason we add it here.
 
     QStringList wl;

diff --git a/src/csvparser.h b/src/csvparser.h
@@ -10,8 +10,7 @@ class QTextStream;
 /*!
  * \brief The CSVProgress class
  *
- * This is an abstract class you can provide overriden provde
- * to the CSVParser to get progress updates.
+ * This is an abstract class, an implementation of which you can pass to the CSVParser to get progress updates.
  */
 class CSVProgress
 {

diff --git a/src/sqlitedb.h b/src/sqlitedb.h
@@ -98,7 +98,7 @@ class DBBrowserDB : public QObject
      * @param name Name of the column to edit
      * @param to The new field definition with changed name, type or the like. If Null-Pointer is given the column is dropped.
      * @param move Set this to a value != 0 to move the new column to a different position
-     * @return true if renaming was successfull, false if not. In the latter case also lastErrorMessage is set
+     * @return true if renaming was successful, false if not. In the latter case also lastErrorMessage is set
      */
     bool renameColumn(const QString& tablename, const QString& name, sqlb::FieldPtr to, int move = 0);
 

diff --git a/src/sqlitetablemodel.cpp b/src/sqlitetablemodel.cpp
@@ -89,7 +89,7 @@ QString removeComments(QString s)
     // a 'simple' regular expression. I know there're better ways to do this...
 
     // This function removes any single line comments (starting with '--') from a given string. It does
-    // so by going through the string character by character and trying to keep track of wether we currently
+    // so by going through the string character by character and trying to keep track of whether we currently
     // are in a string or identifier and only removing those parts starting with '--' which are in neither.
 
     QChar lastChar = 0;

diff --git a/src/sqlitetypes.cpp b/src/sqlitetypes.cpp
@@ -33,7 +33,7 @@ bool Field::isText() const
             || norm.startsWith("varchar")
             || norm.startsWith("varying character")
             || norm.startsWith("nchar")
-            || norm.startsWith("native charactar")
+            || norm.startsWith("native character")
             || norm.startsWith("nvarchar")
             || norm == "text"
             || norm == "clob";

diff --git a/src/sqlitetypes.h b/src/sqlitetypes.h
@@ -103,7 +103,7 @@ class Table
      * @brief findField Finds a field and returns the index.
      * @param sname
      * @return The field index if the field was found.
-     *         -1 if field coulnd't be found.
+     *         -1 if field couldn't be found.
      */
     int findField(const QString& sname);