summaryrefslogtreecommitdiffstats
path: root/examples/painting
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-11-27 03:24:02 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-11-27 03:24:02 (GMT)
commit7d2bf2c6e3aa23d52ef7305915c6f8db02a5d08f (patch)
treedb116b44870e35603dc0d47f9c878525ebfa532c /examples/painting
parent4c78c5c0c2570f5052433f7abfb9d26eb1f2abe3 (diff)
parenta432859f0494b127495932b7365b62a4e579dc2e (diff)
downloadQt-7d2bf2c6e3aa23d52ef7305915c6f8db02a5d08f.zip
Qt-7d2bf2c6e3aa23d52ef7305915c6f8db02a5d08f.tar.gz
Qt-7d2bf2c6e3aa23d52ef7305915c6f8db02a5d08f.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples/painting')
-rw-r--r--examples/painting/fontsampler/mainwindow.cpp12
-rw-r--r--examples/painting/svgviewer/mainwindow.cpp4
2 files changed, 8 insertions, 8 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();
}
diff --git a/examples/painting/svgviewer/mainwindow.cpp b/examples/painting/svgviewer/mainwindow.cpp
index c204de3..6bef5ce 100644
--- a/examples/painting/svgviewer/mainwindow.cpp
+++ b/examples/painting/svgviewer/mainwindow.cpp
@@ -103,8 +103,8 @@ MainWindow::MainWindow()
connect(openAction, SIGNAL(triggered()), this, SLOT(openFile()));
connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
- connect(rendererGroup, SIGNAL(triggered(QAction *)),
- this, SLOT(setRenderer(QAction *)));
+ connect(rendererGroup, SIGNAL(triggered(QAction*)),
+ this, SLOT(setRenderer(QAction*)));
setCentralWidget(m_view);
setWindowTitle(tr("SVG Viewer"));