lkml.org 
[lkml]   [2009]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 30/39] kconfig qconf: fix the type of the desktop widget
    Date
    From: Markus Heidelberg <markus.heidelberg@web.de>

    QApplication::desktop() returns a pointer to QDesktopWidget, not to
    QWidget.

    Fixes the following compiler error after a quick conversion with 'qt3to4',
    which occured with g++ 3.4.6 and 4.1.2, but not anymore with 4.3.2.

    scripts/kconfig/qconf.cc: In constructor 'ConfigMainWindow::ConfigMainWindow()':
    scripts/kconfig/qconf.cc:1289: error: cannot convert 'QDesktopWidget*' to 'QWidget*' in initialization

    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    ---
    scripts/kconfig/qconf.cc | 3 ++-
    1 files changed, 2 insertions(+), 1 deletions(-)

    diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
    index afae613..19811fc 100644
    --- a/scripts/kconfig/qconf.cc
    +++ b/scripts/kconfig/qconf.cc
    @@ -5,6 +5,7 @@

    #include <qapplication.h>
    #include <qmainwindow.h>
    +#include <qdesktopwidget.h>
    #include <qtoolbar.h>
    #include <qlayout.h>
    #include <qvbox.h>
    @@ -1275,7 +1276,7 @@ ConfigMainWindow::ConfigMainWindow(void)
    int x, y, width, height;
    char title[256];

    - QWidget *d = configApp->desktop();
    + QDesktopWidget *d = configApp->desktop();
    snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration"),
    getenv("KERNELVERSION"));
    setCaption(title);
    --
    1.6.3.rc3.40.g75b44


    \
     
     \ /
      Last update: 2009-06-06 02:03    [W:0.019 / U:60.468 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site