[Ktutorial-commits] SF.net SVN: ktutorial:[375] trunk/ktutorial
Status: Alpha
Brought to you by:
danxuliu
From: <dan...@us...> - 2012-08-20 12:23:45
|
Revision: 375 http://ktutorial.svn.sourceforge.net/ktutorial/?rev=375&view=rev Author: danxuliu Date: 2012-08-20 12:23:38 +0000 (Mon, 20 Aug 2012) Log Message: ----------- Fix Krazy2 normalize issues. Modified Paths: -------------- trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteEventSpy.cpp trunk/ktutorial/ktutorial-editor/src/targetapplication/TargetApplication.cpp trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeSelectionManager.cpp trunk/ktutorial/ktutorial-editor/src/view/TutorialTreeSelectionManager.cpp trunk/ktutorial/ktutorial-editor/src/view/WaitForWidget.cpp trunk/ktutorial/ktutorial-editor/tests/unit/view/TreeModelTest.cpp trunk/ktutorial/ktutorial-library/src/view/TutorialManagerDialog.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/EditorSupportTest.cpp trunk/ktutorial/ktutorial-library/tests/editorsupport/EventSpyAdaptorTest.cpp Modified: trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteEventSpy.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteEventSpy.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-editor/src/targetapplication/RemoteEventSpy.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -34,8 +34,8 @@ QDBusInterface* interface = new QDBusInterface( service, "/ktutorial/EventSpy", "org.kde.ktutorial.EventSpy", QDBusConnection::sessionBus(), this); - connect(interface, SIGNAL(eventReceived(int, QString)), - this, SLOT(handleEventReceived(int, QString))); + connect(interface, SIGNAL(eventReceived(int,QString)), + this, SLOT(handleEventReceived(int,QString))); } //private: Modified: trunk/ktutorial/ktutorial-editor/src/targetapplication/TargetApplication.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/targetapplication/TargetApplication.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-editor/src/targetapplication/TargetApplication.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -86,7 +86,7 @@ QDBusConnection::sessionBus().interface(); connect(interface, SIGNAL(serviceRegistered(QString)), this, SLOT(checkNewService(QString))); - connect(interface, SIGNAL(serviceOwnerChanged(QString, QString, QString)), + connect(interface, SIGNAL(serviceOwnerChanged(QString,QString,QString)), this, SLOT(checkNewService(QString))); connect(mProcess, SIGNAL(error(QProcess::ProcessError)), Modified: trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeSelectionManager.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeSelectionManager.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-editor/src/view/RemoteObjectTreeSelectionManager.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2011 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -28,9 +28,9 @@ QItemSelectionModel* itemSelectionModel, QObject* parent): QObject(parent) { connect(itemSelectionModel, - SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, - SLOT(handleSelectionChanged(QItemSelection, QItemSelection))); + SLOT(handleSelectionChanged(QItemSelection,QItemSelection))); } //private: Modified: trunk/ktutorial/ktutorial-editor/src/view/TutorialTreeSelectionManager.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/view/TutorialTreeSelectionManager.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-editor/src/view/TutorialTreeSelectionManager.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -28,9 +28,9 @@ QItemSelectionModel* itemSelectionModel, QObject* parent): QObject(parent) { connect(itemSelectionModel, - SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, - SLOT(handleSelectionChanged(QItemSelection, QItemSelection))); + SLOT(handleSelectionChanged(QItemSelection,QItemSelection))); } //private: Modified: trunk/ktutorial/ktutorial-editor/src/view/WaitForWidget.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/src/view/WaitForWidget.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-editor/src/view/WaitForWidget.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2011 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -87,9 +87,9 @@ delete oldModel; connect(treeView->selectionModel(), - SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, - SLOT(handleSelectionChanged(QItemSelection, QItemSelection))); + SLOT(handleSelectionChanged(QItemSelection,QItemSelection))); } void WaitForWidget::updateWaitForSelection(WaitFor* selectedWaitFor) { Modified: trunk/ktutorial/ktutorial-editor/tests/unit/view/TreeModelTest.cpp =================================================================== --- trunk/ktutorial/ktutorial-editor/tests/unit/view/TreeModelTest.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-editor/tests/unit/view/TreeModelTest.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Daniel Calviño Sánchez * + * Copyright (C) 2010-2012 by Daniel Calviño Sánchez * * dan...@gm... * * * * This program is free software; you can redistribute it and/or modify * @@ -244,8 +244,8 @@ TreeModel model(rootItem); QSignalSpy aboutToSpy(&model, - SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int))); - QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int))); + QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex,int,int))); rootItem->appendChild(new StubTreeItem("root-1", rootItem)); @@ -273,8 +273,8 @@ TreeModel model(rootItem); QSignalSpy aboutToSpy(&model, - SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int))); - QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int))); + QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex,int,int))); rootItem->insertChild(new StubTreeItem("root-2new", rootItem), 1); @@ -307,8 +307,8 @@ TreeModel model(rootItem); QSignalSpy aboutToSpy(&model, - SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int))); - QSignalSpy removedSpy(&model, SIGNAL(rowsRemoved(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int))); + QSignalSpy removedSpy(&model, SIGNAL(rowsRemoved(QModelIndex,int,int))); TreeItem* itemToBeRemoved = rootItem->child(1); rootItem->removeChild(itemToBeRemoved); @@ -339,11 +339,11 @@ TreeItem* item = rootItem->child(0)->child(0); QSignalSpy aboutToInsertSpy(&model, - SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int))); - QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int))); + QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex,int,int))); QSignalSpy aboutToRemoveSpy(&model, - SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int))); - QSignalSpy removedSpy(&model, SIGNAL(rowsRemoved(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int))); + QSignalSpy removedSpy(&model, SIGNAL(rowsRemoved(QModelIndex,int,int))); StubTreeItem childToBeRemoved("root-1-1-3", item); item->appendChild(new StubTreeItem("root-1-1-1", item)); @@ -394,11 +394,11 @@ rootItem->child(0)->appendChild(item); QSignalSpy aboutToInsertSpy(&model, - SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int))); - QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int))); + QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex,int,int))); QSignalSpy aboutToRemoveSpy(&model, - SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int))); - QSignalSpy removedSpy(&model, SIGNAL(rowsRemoved(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int))); + QSignalSpy removedSpy(&model, SIGNAL(rowsRemoved(QModelIndex,int,int))); StubTreeItem childToBeRemoved("root-1-1-3", item); item->appendChild(new StubTreeItem("root-1-1-1", item)); @@ -449,8 +449,8 @@ rootItem->removeChild(&item); QSignalSpy aboutToSpy(&model, - SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int))); - QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int))); + QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex,int,int))); item.appendChild(new StubTreeItem("root-1-1", &item)); @@ -475,8 +475,8 @@ rootItem->removeChild(&item); QSignalSpy aboutToSpy(&model, - SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int))); - QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex, int, int))); + SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int))); + QSignalSpy insertedSpy(&model, SIGNAL(rowsInserted(QModelIndex,int,int))); nestedItem->appendChild(new StubTreeItem("root-1-1-1", nestedItem)); @@ -497,7 +497,7 @@ TreeModel model(rootItem); QSignalSpy dataChangedSpy(&model, - SIGNAL(dataChanged(QModelIndex, QModelIndex))); + SIGNAL(dataChanged(QModelIndex,QModelIndex))); item->setText("root-1modified"); @@ -527,7 +527,7 @@ //Qt::Orientation must be registered in order to be used with QSignalSpy int orientationIndexType = qRegisterMetaType<Qt::Orientation>("Qt::Orientation"); QSignalSpy headerDataChangedSpy(&model, - SIGNAL(headerDataChanged(Qt::Orientation, int, int))); + SIGNAL(headerDataChanged(Qt::Orientation,int,int))); rootItem->setText("root modified"); Modified: trunk/ktutorial/ktutorial-library/src/view/TutorialManagerDialog.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/src/view/TutorialManagerDialog.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-library/src/view/TutorialManagerDialog.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -52,7 +52,7 @@ enableButton(User1, false); connect(ui->tutorialsList->selectionModel(), - SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(select(QItemSelection))); connect(this, SIGNAL(user1Clicked()), this, SLOT(start())); Modified: trunk/ktutorial/ktutorial-library/tests/editorsupport/EditorSupportTest.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/tests/editorsupport/EditorSupportTest.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-library/tests/editorsupport/EditorSupportTest.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -253,8 +253,8 @@ bus, this); QVERIFY(iface->isValid()); - connect(iface, SIGNAL(eventReceived(int, QString)), - this, SLOT(handleEventReceived(int, QString))); + connect(iface, SIGNAL(eventReceived(int,QString)), + this, SLOT(handleEventReceived(int,QString))); QObject* eventSpyObject = bus.objectRegisteredAt("/ktutorial/EventSpy"); QVERIFY(eventSpyObject); @@ -286,8 +286,8 @@ bus, this); QVERIFY(iface->isValid()); - connect(iface, SIGNAL(eventReceived(int, QString)), - this, SLOT(handleEventReceived(int, QString))); + connect(iface, SIGNAL(eventReceived(int,QString)), + this, SLOT(handleEventReceived(int,QString))); editorSupport.disableEventSpy(); Modified: trunk/ktutorial/ktutorial-library/tests/editorsupport/EventSpyAdaptorTest.cpp =================================================================== --- trunk/ktutorial/ktutorial-library/tests/editorsupport/EventSpyAdaptorTest.cpp 2012-08-20 11:16:43 UTC (rev 374) +++ trunk/ktutorial/ktutorial-library/tests/editorsupport/EventSpyAdaptorTest.cpp 2012-08-20 12:23:38 UTC (rev 375) @@ -53,7 +53,7 @@ ObjectRegister objectRegister; EventSpyAdaptor* adaptor = new EventSpyAdaptor(&spy, &objectRegister); - QSignalSpy eventEmittedSpy(adaptor, SIGNAL(eventReceived(int, QString))); + QSignalSpy eventEmittedSpy(adaptor, SIGNAL(eventReceived(int,QString))); //Send an event not managed by QObject to avoid messing up its internal //state This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |