diff options
| author | Bill King <bill.king@nokia.com> | 2009-11-20 04:29:51 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-11-20 04:29:51 (GMT) |
| commit | 5b1a07e9ccf0a5139273b447e2b2fda6564a506a (patch) | |
| tree | 6ad6fc7836747044713ade6e75d7230b848ba46e /examples/painting/fontsampler/mainwindow.cpp | |
| parent | 0186faea383f3f8223bffd1844e5a47ca22770a5 (diff) | |
| parent | ea0f526ac3a7daef5d4ebff2373a01d4088e28c3 (diff) | |
| download | Qt-5b1a07e9ccf0a5139273b447e2b2fda6564a506a.zip Qt-5b1a07e9ccf0a5139273b447e2b2fda6564a506a.tar.gz Qt-5b1a07e9ccf0a5139273b447e2b2fda6564a506a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'examples/painting/fontsampler/mainwindow.cpp')
| -rw-r--r-- | examples/painting/fontsampler/mainwindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/painting/fontsampler/mainwindow.cpp b/examples/painting/fontsampler/mainwindow.cpp index 9ef4ad3..4f83ba9 100644 --- a/examples/painting/fontsampler/mainwindow.cpp +++ b/examples/painting/fontsampler/mainwindow.cpp @@ -53,10 +53,10 @@ MainWindow::MainWindow(QWidget *parent) setupFontTree(); connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); - connect(fontTree, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), - this, SLOT(showFont(QTreeWidgetItem *))); - connect(fontTree, SIGNAL(itemChanged(QTreeWidgetItem *, int)), - this, SLOT(updateStyles(QTreeWidgetItem *, int))); + connect(fontTree, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), + this, SLOT(showFont(QTreeWidgetItem*))); + connect(fontTree, SIGNAL(itemChanged(QTreeWidgetItem*,int)), + this, SLOT(updateStyles(QTreeWidgetItem*,int))); fontTree->setItemSelected(fontTree->topLevelItem(0), true); showFont(fontTree->topLevelItem(0)); @@ -279,8 +279,8 @@ void MainWindow::on_printPreviewAction_triggered() QPrinter printer(QPrinter::HighResolution); QPrintPreviewDialog preview(&printer, this); - connect(&preview, SIGNAL(paintRequested(QPrinter *)), - this, SLOT(printDocument(QPrinter *))); + connect(&preview, SIGNAL(paintRequested(QPrinter*)), + this, SLOT(printDocument(QPrinter*))); preview.exec(); } |