Skip to content

Commit

Permalink
Include <QRegExpValidator> explicitly
Browse files Browse the repository at this point in the history
Since Qt 5.11, generated ui_getprofilename.h no longer includes QHeaderView
which breaks the chain that included qvalidator.h in getprofilename.cpp.
As it feels rather fragile to rely on such indirect includes, let's include
<QRegExpValidator> explicitly in each file using QRegExpValidator class.
  • Loading branch information
mkubecek committed Jun 6, 2018
1 parent 02e1d15 commit 4b42755
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/gui/diamondcardprofileform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

#include <QRegExp>
#include <QValidator>
#include <QRegExpValidator>
#include "gui.h"
#include "diamondcard.h"
#include "getprofilenameform.h"
Expand Down
2 changes: 1 addition & 1 deletion src/gui/getprofilenameform.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "getprofilenameform.h"

#include <QDir>
#include <QMessageBox>
#include <QRegExpValidator>
#include "user.h"
#include "protocol.h"

Expand Down
1 change: 1 addition & 0 deletions src/gui/inviteform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "sys_settings.h"
#include <QRegExp>
#include <QValidator>
#include <QRegExpValidator>

/*
Copyright (C) 2005-2009 Michel de Boer <michel@twinklephone.com>
Expand Down
1 change: 1 addition & 0 deletions src/gui/mphoneform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
#include <QRegExp>
#include <QValidator>
#include <QSettings>
#include <QRegExpValidator>
#include "buddyform.h"
#include "diamondcardprofileform.h"
#include "osd.h"
Expand Down
1 change: 1 addition & 0 deletions src/gui/numberconversionform.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "numberconversionform.h"

#include <QRegExpValidator>
#include "gui.h"

/*
Expand Down
1 change: 1 addition & 0 deletions src/gui/syssettingsform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "twinkle_config.h"
#include <QRegExp>
#include <QValidator>
#include <QRegExpValidator>
#include "syssettingsform.h"
/*
* Constructs a SysSettingsForm as a child of 'parent', with the
Expand Down
1 change: 1 addition & 0 deletions src/gui/userprofileform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <QStringList>
#include "twinkle_config.h"
#include <QListWidget>
#include <QRegExpValidator>
#include "numberconversionform.h"
#include "util.h"
#include "userprofileform.h"
Expand Down
1 change: 1 addition & 0 deletions src/gui/wizardform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <QTextStream>
#include "gui.h"
#include <QFile>
#include <QRegExpValidator>
#include "wizardform.h"

#define PROV_NONE QT_TRANSLATE_NOOP("WizardForm", "None (direct IP to IP calls)")
Expand Down

0 comments on commit 4b42755

Please sign in to comment.