diff --git a/Doxyfile.in b/Doxyfile.in index fb6fa90f..46df8b91 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -913,7 +913,7 @@ HTML_STYLESHEET = # user-defined cascading style sheet that is included after the standard # style sheets created by doxygen. Using this option one can overrule # certain style aspects. This is preferred over using HTML_STYLESHEET -# since it does not replace the standard style sheet and is therefor more +# since it does not replace the standard style sheet and is therefore more # robust against future updates. Doxygen will copy the style sheet file to # the output directory. @@ -1173,7 +1173,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are # not supported properly for IE 6.0, but are supported on all modern browsers. # Note that when changing this option you need to delete any form_*.png files diff --git a/README.md b/README.md index d0680e4e..8a886ac3 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ Minimalistic simplicity, see [hello](https://github.com/probonopd/hello) for the * Appeal to users coming from macOS * Cross platform: Builds for Linux, FreeBSD * Spatial mode (each folder has its own window) -* Can handle ROX AppDirs (work in progess) -* Can handle GNUstep `.app` bundles (work in progess) +* Can handle ROX AppDirs (work in progress) +* Can handle GNUstep `.app` bundles (work in progress) * Can handle macOS `.app` bundles (not started yet) * Can handle ELF files that are lacking the executable bit (not started yet) * Can handle AppImages (not started yet) diff --git a/cmake/LXQtTranslateDesktop.cmake b/cmake/LXQtTranslateDesktop.cmake index 522ed688..060b7612 100644 --- a/cmake/LXQtTranslateDesktop.cmake +++ b/cmake/LXQtTranslateDesktop.cmake @@ -1,10 +1,10 @@ #============================================================================= # The lxqt_translate_desktop() function was copied from the the -# LXQt LxQtTranste.cmake +# LXQt LxQtTranslate.cmake # # Original Author: Alexander Sokolov # -# funtion lxqt_translate_desktop(_RESULT +# function lxqt_translate_desktop(_RESULT # SOURCES # [TRANSLATION_DIR] translation_directory # ) @@ -13,7 +13,7 @@ # # Input: # -# SOURCES List of input desktop files (.destktop.in) to be translated +# SOURCES List of input desktop files (.desktop.in) to be translated # (merged), relative to the CMakeList.txt. # # TRANSLATION_DIR Optional path to the directory with the .ts files, @@ -34,7 +34,7 @@ function(lxqt_translate_desktop _RESULT) if (NOT ${_UNPARSED_ARGS} STREQUAL "") MESSAGE(FATAL_ERROR "Unknown arguments '${_UNPARSED_ARGS}'.\n" - "See lxqt_translate_desktop() documenation for more information.\n" + "See lxqt_translate_desktop() documentation for more information.\n" ) endif() diff --git a/cmake/LXQtTranslateTs.cmake b/cmake/LXQtTranslateTs.cmake index 5998830f..186ecd30 100644 --- a/cmake/LXQtTranslateTs.cmake +++ b/cmake/LXQtTranslateTs.cmake @@ -25,7 +25,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #============================================================================= # -# funtion lxqt_translate_ts(qmFiles +# function lxqt_translate_ts(qmFiles # [USE_QT5 [Yes | No]] # [UPDATE_TRANSLATIONS [Yes | No]] # SOURCES diff --git a/filer-qt.1.in b/filer-qt.1.in index 28864a8d..cc48b211 100644 --- a/filer-qt.1.in +++ b/filer-qt.1.in @@ -4,7 +4,7 @@ Filer-Qt \- A lightweight Qt based file manager for X Window. .SH SYNOPSIS filer\-qt [OPTION...] [FILE1, FILE2,...] .SH DESCRIPTION -PCMan File Manager Qt (\fBFiler-Qt\fP) is an extremly fast, lightweight, yet +PCMan File Manager Qt (\fBFiler-Qt\fP) is an extremely fast, lightweight, yet feature-rich file manager with tabbed browsing. It is the default file manager for the lightweight desktop environment, \fBLXQt\fP. .SH OPTIONS diff --git a/src/application.cpp b/src/application.cpp index f71f998f..1fe45567 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -80,7 +80,7 @@ Application::Application(int& argc, char** argv): volumeMonitor_(NULL), userDirsWatcher_(NULL), lxqtRunning_(false), - editBookmarksialog_() { + editBookmarksDialog_() { argc_ = argc; argv_ = argv; @@ -251,7 +251,7 @@ bool Application::parseCommandLineArgs() { desktopManager(false); if(parser.isSet(desktopPrefOption)) { // desktop preference dialog - desktopPrefrences(); + desktopPreferences(); keepRunning = true; } else if(parser.isSet(findFilesOption)) { // file searching utility @@ -292,7 +292,7 @@ bool Application::parseCommandLineArgs() { iface.call("desktopManager", false); if(parser.isSet(desktopPrefOption)) { // desktop preference dialog - iface.call("desktopPrefrences", parser.value(desktopPrefOption)); + iface.call("desktopPreferences", parser.value(desktopPrefOption)); } else if(parser.isSet(findFilesOption)) { // file searching utility iface.call("findFiles", parser.positionalArguments()); @@ -322,7 +322,7 @@ void Application::init() { qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); installTranslator(&qtTranslator); - // install our own tranlations + // install our own translation translator.load("filer-qt_" + QLocale::system().name(), PCMANFM_DATA_DIR "/translations"); // qDebug("probono: Use relative path from main executable so that this works when it is not installed system-wide, too:"); // qDebug((QCoreApplication::applicationDirPath() + QString("/../share/filer/translations/")).toUtf8()); // probono @@ -340,7 +340,7 @@ int Application::exec() { volumeMonitor_ = g_volume_monitor_get(); // delay the volume manager a little because in newer versions of glib/gio there's a problem. - // when the first volume monitor object is created, it discovers volumes asynchonously. + // when the first volume monitor object is created, it discovers volumes asynchronously. // g_volume_monitor_get() immediately returns while the monitor is still discovering devices. // So initially g_volume_monitor_get_volumes() returns nothing, but shortly after that // we get volume-added signals for all of the volumes. This is not what we want. @@ -394,7 +394,7 @@ void Application::onSaveStateRequest(QSessionManager& manager) { } void Application::desktopManager(bool enabled) { - // TODO: turn on or turn off desktpo management (desktop icons & wallpaper) + // TODO: turn on or turn off desktop management (desktop icons & wallpaper) qDebug("desktopManager: %d", enabled); QDesktopWidget* desktopWidget = desktop(); if(enabled) { @@ -446,7 +446,7 @@ void Application::desktopManager(bool enabled) { enableDesktopManager_ = enabled; } -void Application::desktopPrefrences() { +void Application::desktopPreferences() { // show desktop preference window if(!desktopPreferencesDialog_) { desktopPreferencesDialog_ = new DesktopPreferencesDialog(); @@ -637,7 +637,7 @@ void Application::onScreenCountChanged(int newCount) { bool isVirtual = desktopWidget->isVirtualDesktop(); if(oldVirtual && isVirtual) { - // if we are using virtual desktop mode previously, and the new mode is sitll virtual + // if we are using virtual desktop mode previously, and the new mode is still virtual // no further change is needed, only do relayout. desktopWindows_.at(0)->queueRelayout(); return; @@ -701,12 +701,12 @@ void Application::updateDesktopsFromSettings() { } void Application::editBookmarks() { - if(!editBookmarksialog_) { + if(!editBookmarksDialog_) { FmBookmarks* bookmarks = fm_bookmarks_dup(); - editBookmarksialog_ = new Fm::EditBookmarksDialog(bookmarks); + editBookmarksDialog_ = new Fm::EditBookmarksDialog(bookmarks); g_object_unref(bookmarks); } - editBookmarksialog_.data()->show(); + editBookmarksDialog_.data()->show(); } void Application::initVolumeManager() { @@ -785,7 +785,7 @@ void Application::onScreenDestroyed(QObject* screenObj) { // #40681: Regression bug: QWidget::winId() returns old value and QEvent::WinIdChange event is not emitted sometimes. (multihead setup) // #40791: Regression: QPlatformWindow, QWindow, and QWidget::winId() are out of sync. // Explanations for the workaround: - // Internally, Qt mantains a list of QScreens and update it when XRandR configuration changes. + // Internally, Qt maintains a list of QScreens and update it when XRandR configuration changes. // When the user turn off an monitor with xrandr --output --off, this will destroy the QScreen // object which represent the output. If the QScreen being destroyed contains our panel widget, // Qt will call QWindow::setScreen(0) on the internal windowHandle() of our panel widget to move it @@ -830,7 +830,7 @@ void Application::reloadDesktopsAsNeeded() { } } -// This slot is for Qt 5 onlt, but the stupid Qt moc cannot do conditional compilation +// This slot is for Qt 5 only, but the stupid Qt moc cannot do conditional compilation // so we have to define it for Qt 4 as well. void Application::onVirtualGeometryChanged(const QRect& rect) { // NOTE: the following is a workaround for Qt bug 32567. diff --git a/src/application.h b/src/application.h index 9fa60281..485a1835 100644 --- a/src/application.h +++ b/src/application.h @@ -64,7 +64,7 @@ class Application : public QApplication { void launchFiles(QString cwd, QStringList paths, bool inNewWindow); void setWallpaper(QString path, QString modeString); void preferences(QString page); - void desktopPrefrences(); + void desktopPreferences(); void editBookmarks(); void desktopManager(bool enabled); void findFiles(QStringList paths = QStringList()); @@ -130,7 +130,7 @@ private Q_SLOTS: QVector desktopWindows_; QPointer preferencesDialog_; QPointer desktopPreferencesDialog_; - QPointer editBookmarksialog_; + QPointer editBookmarksDialog_; QTranslator translator; QTranslator qtTranslator; GVolumeMonitor* volumeMonitor_; diff --git a/src/browsehistory.h b/src/browsehistory.h index 9dfb6462..ade28265 100644 --- a/src/browsehistory.h +++ b/src/browsehistory.h @@ -77,7 +77,7 @@ class LIBFM_QT_API BrowseHistoryItem { private: FmPath* path_; int scrollPos_; - // TODO: we may need to store current selection as well. reserve room for furutre expansion. + // TODO: we may need to store current selection as well. reserve room for future expansion. // void* reserved1; // void* reserved2; }; diff --git a/src/desktoppreferencesdialog.cpp b/src/desktoppreferencesdialog.cpp index fc0d75e4..45c02da8 100644 --- a/src/desktoppreferencesdialog.cpp +++ b/src/desktoppreferencesdialog.cpp @@ -139,7 +139,7 @@ void DesktopPreferencesDialog::onBrowseClicked() { QFileDialog dlg; dlg.setAcceptMode(QFileDialog::AcceptOpen); dlg.setFileMode(QFileDialog::ExistingFile); - // compose a name fileter from QImageReader + // compose a name filter from QImageReader QString filter; filter.reserve(256); filter = tr("Image Files"); diff --git a/src/desktopwindow.cpp b/src/desktopwindow.cpp index 4f41378b..f401ee1a 100644 --- a/src/desktopwindow.cpp +++ b/src/desktopwindow.cpp @@ -152,7 +152,7 @@ DesktopWindow::DesktopWindow(int screenNum): /* * probono: Commenting these out - * for those that are alraedy defined in the Menu solves QAction::event: Ambiguous shortcut overload + * for those that are already defined in the Menu solves QAction::event: Ambiguous shortcut overload shortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_X), this); // cut connect(shortcut, &QShortcut::activated, this, &DesktopWindow::onCutActivated); @@ -462,7 +462,7 @@ void DesktopWindow::prepareFolderMenu(Fm::FolderMenu* menu) { } void DesktopWindow::onDesktopPreferences() { - static_cast(qApp)->desktopPrefrences(); + static_cast(qApp)->desktopPreferences(); } void DesktopWindow::onFilerPreferences() @@ -611,7 +611,7 @@ void DesktopWindow::onIndexesMoved(const QModelIndexList& indexes) { Q_FOREACH(const QModelIndex& index, indexes) { // Under some circumstances, Qt might emit indexMoved for // every single cells in the same row. (when QAbstractItemView::SelectItems is set) - // So indexes list may contain several indixes for the same row. + // So indexes list may contain several indexes for the same row. // Since we only care about rows, not individual cells, // let's handle column 0 of every row here. if(index.column() == 0) { @@ -666,7 +666,7 @@ void DesktopWindow::relayoutItems() { // qDebug() << "set custom pos:" << name << row << index << customPos; continue; } - // check if the current pos is alredy occupied by a custom item + // check if the current pos is already occupied by a custom item bool used = false; for(it = customItemPos_.begin(); it != customItemPos_.end(); ++it) { QPoint customPos = *it; diff --git a/src/filemenu.cpp b/src/filemenu.cpp index 6de67cfb..0c76167a 100644 --- a/src/filemenu.cpp +++ b/src/filemenu.cpp @@ -278,7 +278,7 @@ void FileMenu::addCustomActionItem(QMenu* menu, FmFileActionItem* item) { } } else if(fm_file_action_item_is_action(item)) { - connect(action, &QAction::triggered, this, &FileMenu::onCustomActionTrigerred); + connect(action, &QAction::triggered, this, &FileMenu::onCustomActionTriggered); } } #endif @@ -341,7 +341,7 @@ void FileMenu::onApplicationTriggered() { } #ifdef CUSTOM_ACTIONS -void FileMenu::onCustomActionTrigerred() { +void FileMenu::onCustomActionTriggered() { CustomAction* action = static_cast(sender()); FmFileActionItem* item = action->item(); diff --git a/src/filemenu.h b/src/filemenu.h index 24c46bf6..19a3ac66 100644 --- a/src/filemenu.h +++ b/src/filemenu.h @@ -157,7 +157,7 @@ protected Q_SLOTS: void onEmptyTrashTriggered(); void onApplicationTriggered(); #ifdef CUSTOM_ACTIONS - void onCustomActionTrigerred(); + void onCustomActionTriggered(); #endif /* void onCompress(); diff --git a/src/fileoperation.cpp b/src/fileoperation.cpp index b353a50d..7373f256 100644 --- a/src/fileoperation.cpp +++ b/src/fileoperation.cpp @@ -209,7 +209,7 @@ void FileOperation::handleFinish() { } Q_EMIT finished(); - /* sepcial handling for trash + /* special handling for trash * FIXME: need to refactor this to use a more elegant way later. */ if(job_->type == FM_FILE_OP_TRASH) { /* FIXME: direct access to job struct! */ FmPathList* unable_to_trash = static_cast(g_object_get_data(G_OBJECT(job_), "trash-unsupported")); diff --git a/src/fileoperation.h b/src/fileoperation.h index 0acb515a..9b797aa3 100644 --- a/src/fileoperation.h +++ b/src/fileoperation.h @@ -97,7 +97,7 @@ Q_OBJECT return (Type)job_->type; } - // convinient static functions + // convenient static functions static FileOperation* copyFiles(FmPathList* srcFiles, FmPath* dest, QWidget* parent = 0); static FileOperation* moveFiles(FmPathList* srcFiles, FmPath* dest, QWidget* parent = 0); static FileOperation* symlinkFiles(FmPathList* srcFiles, FmPath* dest, QWidget* parent = 0); diff --git a/src/folderview.cpp b/src/folderview.cpp index 286380a6..43130afa 100644 --- a/src/folderview.cpp +++ b/src/folderview.cpp @@ -79,7 +79,7 @@ QModelIndex FolderViewListView::indexAt(const QPoint& point) const { // Q_ASSERT(delegate != NULL); // We use the grid size - (2, 2) as the size of the bounding rectangle of the whole item. // The width of the text label hence is gridSize.width - 2, and the width and height of the icon is from iconSize(). - QRect visRect = visualRect(index); // visibal area on the screen + QRect visRect = visualRect(index); // visible area on the screen QSize itemSize = gridSize(); itemSize.setWidth(itemSize.width() - 2); itemSize.setHeight(itemSize.height() - 2); @@ -99,7 +99,7 @@ QModelIndex FolderViewListView::indexAt(const QPoint& point) const { // NOTE: // QListView has a problem which I consider a bug or a design flaw. -// When you set movement property to Static, theoratically the icons +// When you set movement property to Static, theoretically the icons // should not be movable. However, if you turned on icon mode, // the icons becomes freely movable despite the value of movement is Static. // To overcome this bug, we override all drag handling methods, and @@ -231,7 +231,7 @@ void FolderViewTreeView::dropEvent(QDropEvent* e) { // the default list mode of QListView handles column widths // very badly (worse than gtk+) and it's not very flexible. -// so, let's handle column widths outselves. +// so, let's handle column widths ourselves. void FolderViewTreeView::layoutColumns() { // qDebug("layoutColumns"); if(!model()) @@ -256,7 +256,7 @@ void FolderViewTreeView::layoutColumns() { } int filenameColumn = headerView->visualIndex(FolderModel::ColumnFileName); - // if the total witdh we want exceeds the available space + // if the total width we want exceeds the available space if(desiredWidth > availWidth) { // Compute the width available for the filename column int filenameAvailWidth = availWidth - desiredWidth + widths[filenameColumn]; @@ -783,7 +783,7 @@ void FolderView::selectAll() { else { // NOTE: By default QListView::selectAll() selects all columns in the model. // However, QListView only show the first column. Normal selection by mouse - // can only select the first column of every row. I consider this discripancy yet + // can only select the first column of every row. I consider this discrepancy yet // another design flaw of Qt. To make them consistent, we do it ourselves by only // selecting the first column of every row and do not select all columns as Qt does. // This will trigger one selectionChanged event per row, which is very inefficient, @@ -889,7 +889,7 @@ bool FolderView::eventFilter(QObject* watched, QEvent* event) { // This is to fix #85: Scrolling doesn't work in compact view // Actually, I think it's the bug of Qt, not ours. // When in compact mode, only the horizontal scroll bar is used and the vertical one is hidden. - // So, when a user scroll his mouse wheel, it's reasonable to scroll the horizontal scollbar. + // So, when a user scroll his mouse wheel, it's reasonable to scroll the horizontal scrollbar. // Qt does not implement such a simple feature, unfortunately. // We do it by forwarding the scroll event in the viewport to the horizontal scrollbar. // FIXME: if someday Qt supports this, we have to disable the workaround. diff --git a/src/icontheme.cpp b/src/icontheme.cpp index a8b6b868..908a0560 100644 --- a/src/icontheme.cpp +++ b/src/icontheme.cpp @@ -40,7 +40,7 @@ IconTheme::IconTheme(): currentThemeName_(QIcon::themeName()) { // NOTE: only one instance is allowed Q_ASSERT(theIconTheme == NULL); - Q_ASSERT(qApp != NULL); // QApplication should exists before contructing IconTheme. + Q_ASSERT(qApp != NULL); // QApplication should exists before constructing IconTheme. theIconTheme = this; fm_icon_set_user_data_destroy(reinterpret_cast(fmIconDataDestroy)); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index b0d64e04..121f5a9a 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -147,7 +147,7 @@ MainWindow::MainWindow(FmPath* path): loadBookmarksMenu(); // Fix the menu groups which is not done by Qt designer - // To my suprise, this was supported in Qt designer 3 :-( + // To my surprise, this was supported in Qt designer 3 :-( QActionGroup* group = new QActionGroup(ui.menu_View); group->setExclusive(true); group->addAction(ui.actionIconView); @@ -780,7 +780,7 @@ void MainWindow::onTabBarCloseRequested(int index) { void MainWindow::onTabBarTabMoved(int from, int to) { // a tab in the tab bar is moved by the user, so we have to move the - // corredponding tab page in the stacked widget to the new position, too. + // corresponding tab page in the stacked widget to the new position, too. QWidget* page = ui.stackedWidget->widget(from); if(page) { // we're not going to delete the tab page, so here we block signals @@ -1032,7 +1032,7 @@ void MainWindow::onTabPageStatusChanged(int type, QString statusText) { switch(type) { case TabPage::StatusTextNormal: case TabPage::StatusTextSelectedFiles: { - // FIXME: updating the status text so frequently is a little bit ineffiecient + // FIXME: updating the status text so frequently is a little bit inefficient QString text = statusText = tabPage->statusText(TabPage::StatusTextSelectedFiles); if(text.isEmpty()) { ui.statusbar->showMessage(tabPage->statusText(TabPage::StatusTextNormal)); diff --git a/src/metadata.cpp b/src/metadata.cpp index bfc2a14c..19580efd 100644 --- a/src/metadata.cpp +++ b/src/metadata.cpp @@ -55,7 +55,7 @@ static const QString WINDOW_FILTER = "WindowFilter"; static const QString XATTR_NAMESPACE = "user"; /* - * get the attibute value from the extended attribute for the path as int + * get the attribute value from the extended attribute for the path as int */ int getAttributeValueInt(const QString& path, const QString& attribute, bool& ok) { int value = 0; @@ -88,7 +88,7 @@ int getAttributeValueInt(const QString& path, const QString& attribute, bool& ok } /* - * set the attibute value in the extended attribute for the path as int + * set the attribute value in the extended attribute for the path as int */ bool setAttributeValueInt(const QString& path, const QString& attribute, int value) { // set the value from the extended attribute for the path diff --git a/src/mountoperation.h b/src/mountoperation.h index 1209935b..1c16bcb1 100644 --- a/src/mountoperation.h +++ b/src/mountoperation.h @@ -36,7 +36,7 @@ namespace Fm { // Need to find a better API design which make things fully async and cancellable. // FIXME: parent_ does not work. All dialogs shown by the mount operation has no parent window assigned. -// FIXME: Need to reconsider the propery way of API design. Blocking sync calls are handy, but +// FIXME: Need to reconsider the property way of API design. Blocking sync calls are handy, but // indeed causes some problems. :-( class LIBFM_QT_API MountOperation: public QObject { diff --git a/src/mountoperationpassworddialog.cpp b/src/mountoperationpassworddialog.cpp index 9f0eb0f6..7013dfee 100644 --- a/src/mountoperationpassworddialog.cpp +++ b/src/mountoperationpassworddialog.cpp @@ -41,7 +41,7 @@ MountOperationPasswordDialog::MountOperationPasswordDialog(MountOperation* op, G connect(ui->Anonymous, &QAbstractButton::toggled, this, &MountOperationPasswordDialog::onAnonymousToggled); if(canAnonymous) { - // select ananymous by default if applicable. + // select anonymous by default if applicable. ui->Anonymous->setChecked(true); } else { diff --git a/src/org.filer.Application.xml b/src/org.filer.Application.xml index d4b646be..b5779894 100644 --- a/src/org.filer.Application.xml +++ b/src/org.filer.Application.xml @@ -4,7 +4,7 @@ - + diff --git a/src/placesmodel.cpp b/src/placesmodel.cpp index 827b619b..d8abec5d 100644 --- a/src/placesmodel.cpp +++ b/src/placesmodel.cpp @@ -106,9 +106,9 @@ PlacesModel::PlacesModel(QObject* parent): // probono: We want to use the file manager itself to launch the apps, hence we do not show Applications in the sidebar // probono: TODO: Show it but jump to something like /Applications and/or ~/Applications instead // // FIXME: add an option to hide applications:/// - // const char* applicaion_icon_names[] = {"system-software-install", "applications-accessories", "application-x-executable"}; + // const char* application_icon_names[] = {"system-software-install", "applications-accessories", "application-x-executable"}; // // NOTE: g_themed_icon_new_from_names() accepts char**, but actually const char** is OK. - // GIcon* gicon = g_themed_icon_new_from_names((char**)applicaion_icon_names, G_N_ELEMENTS(applicaion_icon_names)); + // GIcon* gicon = g_themed_icon_new_from_names((char**)application_icon_names, G_N_ELEMENTS(application_icon_names)); // FmIcon* fmicon = fm_icon_from_gicon(gicon); // g_object_unref(gicon); // applicationsItem = new PlacesModelItem(fmicon, tr("Applications"), fm_path_get_apps_menu()); diff --git a/src/placesview.cpp b/src/placesview.cpp index 993d6b62..619279c3 100644 --- a/src/placesview.cpp +++ b/src/placesview.cpp @@ -44,7 +44,7 @@ PlacesView::PlacesView(QWidget* parent): setIconSize(QSize(24, 24)); - // FIXME: we may share this model amont all views + // FIXME: we may share this model among all views model_ = new PlacesModel(this); setModel(model_); diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp index cf543587..0f2669bc 100644 --- a/src/preferencesdialog.cpp +++ b/src/preferencesdialog.cpp @@ -85,7 +85,7 @@ void PreferencesDialog::initIconThemes(Settings& settings) { if(settings.useFallbackIconTheme()) { // auto-detection failed // load xdg icon themes and select the current one QHash iconThemes; - // user customed icon themes + // user customized icon themes findIconThemesInDir(iconThemes, QString(g_get_home_dir()) % "/.icons"); // search for icons in system data dir diff --git a/src/proxyfoldermodel.cpp b/src/proxyfoldermodel.cpp index 84b7e0b6..55a81f49 100644 --- a/src/proxyfoldermodel.cpp +++ b/src/proxyfoldermodel.cpp @@ -48,7 +48,7 @@ ProxyFolderModel::~ProxyFolderModel() { if(showThumbnails_ && thumbnailSize_ != 0) { FolderModel* srcModel = static_cast(sourceModel()); - // tell the source model that we don't need the thumnails anymore + // tell the source model that we don't need the thumbnails anymore if(srcModel) { srcModel->releaseThumbnails(thumbnailSize_); disconnect(srcModel, SIGNAL(thumbnailLoaded(QModelIndex,int))); diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp index 99fa43a2..721c5bcc 100644 --- a/src/renamedialog.cpp +++ b/src/renamedialog.cpp @@ -129,7 +129,7 @@ void RenameDialog::onFileNameChanged(QString newName) { renameButton_->setEnabled(hasNewName); renameButton_->setDefault(hasNewName); - // change default button to rename rather than overwrire + // change default button to rename rather than overwrite // if the user typed a new filename QPushButton* overwriteButton = static_cast(ui->buttonBox->button(QDialogButtonBox::Ok)); overwriteButton->setEnabled(!hasNewName); diff --git a/src/utilities_p.h b/src/utilities_p.h index b1c43c25..de589cfe 100644 --- a/src/utilities_p.h +++ b/src/utilities_p.h @@ -17,8 +17,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __UTILITS_P_H__ -#define __UTILITS_P_H__ +#ifndef __UTILITIES_P_H__ +#define __UTILITIES_P_H__ #include #include