lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 1/5] kconfig: qconf: cleanup includes
    Date
    The usage of c-like include is deprecated on modern Qt
    versions. Use the c++ style includes.

    While here, remove uneeded and redundant ones, sorting
    them on alphabetic order.

    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    ---
    scripts/kconfig/qconf.cc | 27 +++++++++------------------
    scripts/kconfig/qconf.h | 14 +++++++-------
    2 files changed, 16 insertions(+), 25 deletions(-)

    diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
    index c0ac8f7b5f1a..0e06afa08908 100644
    --- a/scripts/kconfig/qconf.cc
    +++ b/scripts/kconfig/qconf.cc
    @@ -4,27 +4,18 @@
    * Copyright (C) 2015 Boris Barbulovski <bbarbulovski@gmail.com>
    */

    -#include <qglobal.h>
    -
    -#include <QMainWindow>
    -#include <QList>
    -#include <qtextbrowser.h>
    #include <QAction>
    +#include <QApplication>
    +#include <QCloseEvent>
    +#include <QDesktopWidget>
    #include <QFileDialog>
    +#include <QLabel>
    +#include <QLayout>
    +#include <QList>
    #include <QMenu>
    -
    -#include <qapplication.h>
    -#include <qdesktopwidget.h>
    -#include <qtoolbar.h>
    -#include <qlayout.h>
    -#include <qsplitter.h>
    -#include <qlineedit.h>
    -#include <qlabel.h>
    -#include <qpushbutton.h>
    -#include <qmenubar.h>
    -#include <qmessagebox.h>
    -#include <qregexp.h>
    -#include <qevent.h>
    +#include <QMenuBar>
    +#include <QMessageBox>
    +#include <QToolBar>

    #include <stdlib.h>

    diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
    index c879d79ce817..d913a02967ae 100644
    --- a/scripts/kconfig/qconf.h
    +++ b/scripts/kconfig/qconf.h
    @@ -3,17 +3,17 @@
    * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
    */

    -#include <QTextBrowser>
    -#include <QTreeWidget>
    -#include <QMainWindow>
    +#include <QCheckBox>
    +#include <QDialog>
    #include <QHeaderView>
    -#include <qsettings.h>
    +#include <QLineEdit>
    +#include <QMainWindow>
    #include <QPushButton>
    #include <QSettings>
    -#include <QLineEdit>
    #include <QSplitter>
    -#include <QCheckBox>
    -#include <QDialog>
    +#include <QTextBrowser>
    +#include <QTreeWidget>
    +
    #include "expr.h"

    class ConfigView;
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-06-29 23:37    [W:6.127 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site