diff --git a/doc-extras/ChangeLog b/doc-extras/ChangeLog --- a/doc-extras/ChangeLog +++ b/doc-extras/ChangeLog @@ -11,7 +11,7 @@ ADDED: Add documentation on the new options to move tabs left or right ADDED: Add a note on the new capabilities of the "Search for" combobox FIXED: Links on docs.kde.org - ADDED: Document new options to hide SquasFS entries and selected mountpoints from Media menu + ADDED: Document new options to hide SquashFS entries and selected mountpoints from Media menu 2.7.2 diff --git a/krusader/DiskUsage/filelightParts/fileTree.h b/krusader/DiskUsage/filelightParts/fileTree.h --- a/krusader/DiskUsage/filelightParts/fileTree.h +++ b/krusader/DiskUsage/filelightParts/fileTree.h @@ -214,7 +214,7 @@ class File { protected: - Directory *m_parent; //0 if this is treeRoot + Directory *m_parent; // 0 if this is treeRoot QString m_name; //< file name QString m_directory;//< the directory of the file FileSize m_size; //< size with subdirectories diff --git a/krusader/DiskUsage/radialMap/labels.cpp b/krusader/DiskUsage/radialMap/labels.cpp --- a/krusader/DiskUsage/radialMap/labels.cpp +++ b/krusader/DiskUsage/radialMap/labels.cpp @@ -104,7 +104,7 @@ unsigned int startLevel = 0; - //1. Create list of labels sorted in the order they will be rendered + // 1. Create list of labels sorted in the order they will be rendered if (m_focus != nullptr && m_focus->file() != m_tree) { //separate behavior for selected vs unselected segments //don't bother with files @@ -154,7 +154,7 @@ } - //2. Check to see if any adjacent labels are too close together + // 2. Check to see if any adjacent labels are too close together // if so, remove the least significant labels int itn = 0; @@ -188,7 +188,7 @@ auto *sizes = new int [ m_map.m_visibleDepth + 1 ]; //**** make sizes an array of floats I think instead (or doubles) do { - //3. Calculate font sizes + // 3. Calculate font sizes { //determine current range of levels to draw for @@ -223,7 +223,7 @@ } } - //4. determine label co-ordinates + // 4. determine label co-ordinates int x1, y1, x2, y2, x3, tx, ty; //coords double sinra, cosra, ra; //angles @@ -344,7 +344,7 @@ } while (it != list.end()); - //5. Render labels + // 5. Render labels paint.setPen(QPen(Qt::black, 1)); diff --git a/krusader/DiskUsage/radialMap/map.cpp b/krusader/DiskUsage/radialMap/map.cpp --- a/krusader/DiskUsage/radialMap/map.cpp +++ b/krusader/DiskUsage/radialMap/map.cpp @@ -176,7 +176,7 @@ QColor kdeColour[2] = { KColorScheme(QPalette::Inactive, KColorScheme::Window).background().color(), KColorScheme(QPalette::Active, KColorScheme::Window).background(KColorScheme::ActiveBackground).color() }; - double deltaRed = (double)(kdeColour[0].red() - kdeColour[1].red()) / 2880; //2880 for semicircle + double deltaRed = (double)(kdeColour[0].red() - kdeColour[1].red()) / 2880; // 2880 for semicircle double deltaGreen = (double)(kdeColour[0].green() - kdeColour[1].green()) / 2880; double deltaBlue = (double)(kdeColour[0].blue() - kdeColour[1].blue()) / 2880; diff --git a/krusader/DiskUsage/radialMap/widget.h b/krusader/DiskUsage/radialMap/widget.h --- a/krusader/DiskUsage/radialMap/widget.h +++ b/krusader/DiskUsage/radialMap/widget.h @@ -119,10 +119,10 @@ const Segment *segmentAt(QPoint&) const; //FIXME const reference for a library others can use const Segment *rootSegment() const { return m_rootSegment; - } ///never == 0 + } /// never == 0 const Segment *focusSegment() const { return m_focus; - } ///0 == nothing in focus + } /// 0 == nothing in focus private: void paintExplodedLabels(QPainter&) const; diff --git a/krusader/DiskUsage/radialMap/widgetEvents.cpp b/krusader/DiskUsage/radialMap/widgetEvents.cpp --- a/krusader/DiskUsage/radialMap/widgetEvents.cpp +++ b/krusader/DiskUsage/radialMap/widgetEvents.cpp @@ -108,7 +108,7 @@ //ai = x, bi=1, aj=y, bj=0 //cos angle = x / (length) - auto a = (uint)(acos((double)e.x() / length) * 916.736); //916.7324722 = #radians in circle * 16 + auto a = (uint)(acos((double)e.x() / length) * 916.736); // 916.7324722 = #radians in circle * 16 //acos only understands 0-180 degrees if (e.y() < 0) a = 5760 - a; diff --git a/krusader/FileSystem/krquery.cpp b/krusader/FileSystem/krquery.cpp --- a/krusader/FileSystem/krquery.cpp +++ b/krusader/FileSystem/krquery.cpp @@ -771,6 +771,7 @@ whereNotToSearch.append(completed); } } + void KrQuery::setExcludeFolderNames(const QStringList &paths) { excludedFolderNames.clear(); diff --git a/krusader/Filter/generalfilter.h b/krusader/Filter/generalfilter.h --- a/krusader/Filter/generalfilter.h +++ b/krusader/Filter/generalfilter.h @@ -85,12 +85,12 @@ KURLListRequester *dontSearchIn; QLayout *middleLayout; - KrHistoryComboBox* searchFor; + KrHistoryComboBox *searchFor; KrHistoryComboBox *containsText; KrHistoryComboBox *excludeFolderNames; - QToolButton* containsRegExp; + QToolButton *containsRegExp; - KComboBox* ofType; + KComboBox *ofType; QLabel *encLabel; QLabel *containsLabel;