summaryrefslogtreecommitdiffstats
path: root/src/gvcore
diff options
context:
space:
mode:
authorAlexander Golubev <fatzer2@gmail.com>2024-02-17 22:29:31 +0300
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-02-22 18:29:31 +0900
commitad01a7f1f9dee617e1c41434000788e93e4a82bd (patch)
treea4a3913b1e930c6683b0da587a2c19c770c4f2e1 /src/gvcore
parent801c90b6c2cb7b3632aa9d20da59b80b104d2c85 (diff)
downloadgwenview-ad01a7f1f9dee617e1c41434000788e93e4a82bd.tar.gz
gwenview-ad01a7f1f9dee617e1c41434000788e93e4a82bd.zip
Various small improvements
- fix some warnings about struct/class deslaration/definition mismatch - fix incorrect assert in jpegcontent.cpp - add a note - null a pointer after deleting a job Signed-off-by: Alexander Golubev <fatzer2@gmail.com> (cherry picked from commit d4548234b93404404e8807ac6fe5c671faad68f2)
Diffstat (limited to 'src/gvcore')
-rw-r--r--src/gvcore/filethumbnailview.cpp1
-rw-r--r--src/gvcore/filethumbnailview.h2
-rw-r--r--src/gvcore/filethumbnailviewitem.cpp5
-rw-r--r--src/gvcore/fileviewcontroller.cpp3
4 files changed, 7 insertions, 4 deletions
diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp
index b0c47b2..e12f652 100644
--- a/src/gvcore/filethumbnailview.cpp
+++ b/src/gvcore/filethumbnailview.cpp
@@ -388,6 +388,7 @@ void FileThumbnailView::doStartThumbnailUpdate(const KFileItemList* list) {
void FileThumbnailView::stopThumbnailUpdate() {
if (!d->mThumbnailLoadJob.isNull()) {
d->mThumbnailLoadJob->kill(false);
+ d->mThumbnailLoadJob=NULL;
}
}
diff --git a/src/gvcore/filethumbnailview.h b/src/gvcore/filethumbnailview.h
index 4809501..37788fd 100644
--- a/src/gvcore/filethumbnailview.h
+++ b/src/gvcore/filethumbnailview.h
@@ -105,7 +105,7 @@ protected:
virtual void keyPressEvent( TQKeyEvent* );
private:
- class Private;
+ struct Private;
Private* d;
void updateGrid();
diff --git a/src/gvcore/filethumbnailviewitem.cpp b/src/gvcore/filethumbnailviewitem.cpp
index dae4172..d017140 100644
--- a/src/gvcore/filethumbnailviewitem.cpp
+++ b/src/gvcore/filethumbnailviewitem.cpp
@@ -283,8 +283,11 @@ void FileThumbnailViewItem::calcRect(const TQString&) {
itemTextRect.moveLeft(PADDING);
itemTextRect.moveTop(thumbnailSize + PADDING * 2);
}
-
+
// Update rects
+ // NOTE: this results in 3 calls to TQIconViewContainer(), which is costly if
+ // there are a lot (tens of thousands) of items, unfortunately there
+ // is no way to workaround this in current (14.1.1, 2024) TQt API
if ( itemPixmapRect != pixmapRect() ) {
setPixmapRect( itemPixmapRect );
}
diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
index ffcb971..40ec6ea 100644
--- a/src/gvcore/fileviewcontroller.cpp
+++ b/src/gvcore/fileviewcontroller.cpp
@@ -172,8 +172,7 @@ private:
// FileViewController::Private
//
//-----------------------------------------------------------------------
-class FileViewController::Private {
-public:
+struct FileViewController::Private {
~Private() {
delete mSliderTracker;
}