aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/sharedfileswindow
diff options
context:
space:
mode:
authorGravatar wodim2019-04-01 15:01:02 +0200
committerGravatar GitHub2019-04-01 15:01:02 +0200
commit1e89e2da2e3740e55642c8ce44c573cd4bbe6ea9 (patch)
tree94cfdd5000b6b0d6af1272e89f8b234fd8c484d4 /src/modules/sharedfileswindow
parentAdd support for Python 3 (diff)
parentuintUserListMinimumWidth: Reduce minimum due to account for certain combinati... (diff)
downloadKVIrc-1e89e2da2e3740e55642c8ce44c573cd4bbe6ea9.tar.gz
KVIrc-1e89e2da2e3740e55642c8ce44c573cd4bbe6ea9.tar.bz2
KVIrc-1e89e2da2e3740e55642c8ce44c573cd4bbe6ea9.zip
Merge branch 'master' into python3
Diffstat (limited to 'src/modules/sharedfileswindow')
-rw-r--r--src/modules/sharedfileswindow/SharedFilesWindow.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.h b/src/modules/sharedfileswindow/SharedFilesWindow.h
index fd9fd6dee..96de53ef3 100644
--- a/src/modules/sharedfileswindow/SharedFilesWindow.h
+++ b/src/modules/sharedfileswindow/SharedFilesWindow.h
@@ -57,7 +57,7 @@ class SharedFileEditDialog : public QDialog
{
Q_OBJECT
public:
- SharedFileEditDialog(QWidget * par, KviSharedFile * f = 0);
+ SharedFileEditDialog(QWidget * par, KviSharedFile * f = nullptr);
virtual ~SharedFileEditDialog();
QDateTimeEdit * m_pExpireDateTimeEdit;