← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/psi/jaunty

« back to all changes in this revision

Viewing changes to src/tools/mac_dock/docktest.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2008-04-14 18:57:30 UTC
  • mfrom: (2.1.9 hardy)
  • Revision ID: james.westby@ubuntu.com-20080414185730-528re3zp0m2hdlhi
Tags: 0.11-8
http://bugs.debian.org/476122
* added CONFIG -= link_prl to .pro files and removed dependencies
  which are made unnecessary by this change
* Fix segfault when closing last chat tab with qt4.4
  (This is from upstream svn, rev. 1101) (Closes: Bug#476122)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/tools/mac_dock/docktest.cpp
27
27
#include <qmessagebox.h>
28
28
#include <qpushbutton.h>
29
29
#include <qlayout.h>
30
 
#include <qvbox.h>
 
30
#include <QVBoxLayout>
31
31
#include <qlineedit.h>
32
32
#include <qcheckbox.h>
33
33
#include <qlabel.h>
39
39
        Q_OBJECT
40
40
 
41
41
public:
42
 
    DockTestWidget( QWidget *parent=0, const char *name=0 );
 
42
    DockTestWidget( QWidget *parent=0);
43
43
 
44
44
public slots:
45
45
        void do_overlay();
49
49
};
50
50
 
51
51
 
52
 
DockTestWidget::DockTestWidget( QWidget *parent, const char *name ) : QWidget(parent, name)
 
52
DockTestWidget::DockTestWidget( QWidget *parent ) : QWidget(parent)
53
53
{
54
54
        // Initialize widgets
55
 
        QGridLayout *layout = new QGridLayout(this,4,2);
 
55
        QGridLayout *layout = new QGridLayout(this);
56
56
 
57
57
        layout->addWidget(new QLabel("Text",this),0,0);
58
58
        text = new QLineEdit(this);
68
68
{
69
69
    QApplication a( argc, argv );
70
70
    DockTestWidget w;
71
 
    a.setMainWidget( &w );
72
71
    w.show();
73
72
    return a.exec();
74
73
}