[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kphotoalbum] MainWindow: Renamed _instance to s_instance.
From:       Tobias Leupold <null () kde ! org>
Date:       2018-01-01 8:38:40
Message-ID: E1eVvcG-0004aO-V8 () code ! kde ! org
[Download RAW message or body]

Git commit c6785c9c456dd6c5653e68e758ce682908e74133 by Tobias Leupold.
Committed on 01/01/2018 at 08:37.
Pushed by tleupold into branch 'master'.

Renamed _instance to s_instance.

M  +4    -4    MainWindow/DirtyIndicator.cpp

https://commits.kde.org/kphotoalbum/c6785c9c456dd6c5653e68e758ce682908e74133

diff --git a/MainWindow/DirtyIndicator.cpp b/MainWindow/DirtyIndicator.cpp
index d0fe6bf7..19672cce 100644
--- a/MainWindow/DirtyIndicator.cpp
+++ b/MainWindow/DirtyIndicator.cpp
@@ -21,7 +21,7 @@
 #include <QPixmap>
 #include <QLabel>
 
-static MainWindow::DirtyIndicator* _instance = nullptr;
+static MainWindow::DirtyIndicator* s_instance = nullptr;
 bool MainWindow::DirtyIndicator::s_autoSaveDirty = false;
 bool MainWindow::DirtyIndicator::s_saveDirty = false;
 bool MainWindow::DirtyIndicator::s_suppressMarkDirty = false;
@@ -31,7 +31,7 @@ MainWindow::DirtyIndicator::DirtyIndicator( QWidget* parent )
 {
     m_dirtyPix = QPixmap( SmallIcon( QString::fromLatin1( "media-floppy" ) ) );
     setFixedWidth( m_dirtyPix.width() + 10);
-    _instance = this;
+    s_instance = this;
 
     // Might have been marked dirty even before the indicator had been created, by \
the database searching during loading.  if ( s_saveDirty )
@@ -49,8 +49,8 @@ void MainWindow::DirtyIndicator::markDirty()
         return;
     }
 
-    if ( _instance ) {
-        _instance->markDirtySlot();
+    if ( s_instance ) {
+        s_instance->markDirtySlot();
     } else {
         s_saveDirty = true;
         s_autoSaveDirty = true;


[prev in list] [next in list] [prev in thread] [next in thread]