diff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) | 
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) | 
| commit | cfbdb43d2cadd40aa87338d41548e4bf89e146e6 (patch) | |
| tree | 18d94153a302445196fc0c18586abf44a1ce4a38 /Swift/QtUI/EventViewer/QtEventWindow.cpp | |
| parent | 1d545a4a7fb877f021508094b88c1f17b30d8b4e (diff) | |
| download | swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.zip swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.tar.bz2 | |
Convert tabs to 4 spaces for all source files
Removed trailing spaces and whitespace on empty lines
in the process.
Changed CheckTabs.py tool to disallow hard tabs in source
files.
Test-Information:
Manually checked 30 random files that the conversion worked
as expected.
Change-Id: I874f99d617bd3d2bb55f02d58f22f58f9b094480
Diffstat (limited to 'Swift/QtUI/EventViewer/QtEventWindow.cpp')
| -rw-r--r-- | Swift/QtUI/EventViewer/QtEventWindow.cpp | 140 | 
1 files changed, 70 insertions, 70 deletions
| diff --git a/Swift/QtUI/EventViewer/QtEventWindow.cpp b/Swift/QtUI/EventViewer/QtEventWindow.cpp index f92cd07..8395a6c 100644 --- a/Swift/QtUI/EventViewer/QtEventWindow.cpp +++ b/Swift/QtUI/EventViewer/QtEventWindow.cpp @@ -26,97 +26,97 @@  namespace Swift {  QtEventWindow::QtEventWindow(UIEventStream* eventStream) : EventWindow(false) { -	QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom, this); -	layout->setContentsMargins(0,0,0,0); -	layout->setSpacing(0); - -	view_ = new QTreeView(this); -	layout->addWidget(view_); -	eventStream_ = eventStream; -	model_ = new EventModel(); -	view_->setModel(model_); -	delegate_ = new EventDelegate(); -	view_->setItemDelegate(delegate_); -	view_->setHeaderHidden(true); +    QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom, this); +    layout->setContentsMargins(0,0,0,0); +    layout->setSpacing(0); + +    view_ = new QTreeView(this); +    layout->addWidget(view_); +    eventStream_ = eventStream; +    model_ = new EventModel(); +    view_->setModel(model_); +    delegate_ = new EventDelegate(); +    view_->setItemDelegate(delegate_); +    view_->setHeaderHidden(true);  #ifdef SWIFT_PLATFORM_MACOSX -	view_->setAlternatingRowColors(true); +    view_->setAlternatingRowColors(true);  #endif -	view_->setAnimated(true); -	view_->setIndentation(0); -	view_->setRootIsDecorated(true); -	 -	readButton_ = new QPushButton(tr("Display Notice"), this); -	layout->addWidget(readButton_); -	readButton_->setEnabled(false); -	connect(readButton_, SIGNAL(clicked()), this, SLOT(handleReadClicked())); -	connect(view_, SIGNAL(clicked(const QModelIndex&)), this, SLOT(handleItemClicked(const QModelIndex&))); -	connect(view_, SIGNAL(activated(const QModelIndex&)), this, SLOT(handleItemActivated(const QModelIndex&))); +    view_->setAnimated(true); +    view_->setIndentation(0); +    view_->setRootIsDecorated(true); + +    readButton_ = new QPushButton(tr("Display Notice"), this); +    layout->addWidget(readButton_); +    readButton_->setEnabled(false); +    connect(readButton_, SIGNAL(clicked()), this, SLOT(handleReadClicked())); +    connect(view_, SIGNAL(clicked(const QModelIndex&)), this, SLOT(handleItemClicked(const QModelIndex&))); +    connect(view_, SIGNAL(activated(const QModelIndex&)), this, SLOT(handleItemActivated(const QModelIndex&)));  }  QtEventWindow::~QtEventWindow() { -	delete model_; -	delete delegate_; -	/* Not view_ because this is the parent */ +    delete model_; +    delete delegate_; +    /* Not view_ because this is the parent */  }  void QtEventWindow::handleItemClicked(const QModelIndex&) { -	readButton_->setEnabled(true); +    readButton_->setEnabled(true);  }  void QtEventWindow::handleReadClicked() { -	QModelIndex index = view_->currentIndex(); -	if (!index.isValid()) { -		return; -	} -	handleItemActivated(index); +    QModelIndex index = view_->currentIndex(); +    if (!index.isValid()) { +        return; +    } +    handleItemActivated(index);  }  void QtEventWindow::handleItemActivated(const QModelIndex& item) { -	QtEvent* event = model_->getItem(item.row()); -	boost::shared_ptr<MessageEvent> messageEvent = boost::dynamic_pointer_cast<MessageEvent>(event->getEvent()); -	boost::shared_ptr<SubscriptionRequestEvent> subscriptionEvent = boost::dynamic_pointer_cast<SubscriptionRequestEvent>(event->getEvent()); -	boost::shared_ptr<MUCInviteEvent> mucInviteEvent = boost::dynamic_pointer_cast<MUCInviteEvent>(event->getEvent()); -	boost::shared_ptr<IncomingFileTransferEvent> incomingFTEvent = boost::dynamic_pointer_cast<IncomingFileTransferEvent>(event->getEvent()); -	boost::shared_ptr<ErrorEvent> errorEvent = boost::dynamic_pointer_cast<ErrorEvent>(event->getEvent()); - -	if (messageEvent) { -		if (messageEvent->getStanza()->getType() == Message::Groupchat) { -			eventStream_->send(boost::shared_ptr<UIEvent>(new JoinMUCUIEvent(messageEvent->getStanza()->getFrom().toBare(), messageEvent->getStanza()->getTo().getResource()))); -		} else { -			eventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(messageEvent->getStanza()->getFrom()))); -		} -	} else if (subscriptionEvent) { -		QtSubscriptionRequestWindow* window = QtSubscriptionRequestWindow::getWindow(subscriptionEvent, this); -		window->show(); -	} else if (mucInviteEvent) { -		eventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(mucInviteEvent->getInviter()))); -		mucInviteEvent->conclude(); -	} else if (incomingFTEvent) { -		eventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(incomingFTEvent->getSender()))); -		incomingFTEvent->conclude(); -	} else { -		if (errorEvent) { -			errorEvent->conclude(); -		} -		QMessageBox msgBox; -		msgBox.setText(model_->data(item, Qt::DisplayRole).toString()); -		msgBox.exec(); -	} +    QtEvent* event = model_->getItem(item.row()); +    boost::shared_ptr<MessageEvent> messageEvent = boost::dynamic_pointer_cast<MessageEvent>(event->getEvent()); +    boost::shared_ptr<SubscriptionRequestEvent> subscriptionEvent = boost::dynamic_pointer_cast<SubscriptionRequestEvent>(event->getEvent()); +    boost::shared_ptr<MUCInviteEvent> mucInviteEvent = boost::dynamic_pointer_cast<MUCInviteEvent>(event->getEvent()); +    boost::shared_ptr<IncomingFileTransferEvent> incomingFTEvent = boost::dynamic_pointer_cast<IncomingFileTransferEvent>(event->getEvent()); +    boost::shared_ptr<ErrorEvent> errorEvent = boost::dynamic_pointer_cast<ErrorEvent>(event->getEvent()); + +    if (messageEvent) { +        if (messageEvent->getStanza()->getType() == Message::Groupchat) { +            eventStream_->send(boost::shared_ptr<UIEvent>(new JoinMUCUIEvent(messageEvent->getStanza()->getFrom().toBare(), messageEvent->getStanza()->getTo().getResource()))); +        } else { +            eventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(messageEvent->getStanza()->getFrom()))); +        } +    } else if (subscriptionEvent) { +        QtSubscriptionRequestWindow* window = QtSubscriptionRequestWindow::getWindow(subscriptionEvent, this); +        window->show(); +    } else if (mucInviteEvent) { +        eventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(mucInviteEvent->getInviter()))); +        mucInviteEvent->conclude(); +    } else if (incomingFTEvent) { +        eventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(incomingFTEvent->getSender()))); +        incomingFTEvent->conclude(); +    } else { +        if (errorEvent) { +            errorEvent->conclude(); +        } +        QMessageBox msgBox; +        msgBox.setText(model_->data(item, Qt::DisplayRole).toString()); +        msgBox.exec(); +    }  }  void QtEventWindow::addEvent(boost::shared_ptr<StanzaEvent> event, bool active) { -	view_->clearSelection(); -	model_->addEvent(event, active); -	emit onNewEventCountUpdated(model_->getNewEventCount()); -	readButton_->setEnabled(model_->rowCount() > 0); +    view_->clearSelection(); +    model_->addEvent(event, active); +    emit onNewEventCountUpdated(model_->getNewEventCount()); +    readButton_->setEnabled(model_->rowCount() > 0);  }  void QtEventWindow::removeEvent(boost::shared_ptr<StanzaEvent> event) { -	view_->clearSelection(); -	model_->removeEvent(event); -	emit onNewEventCountUpdated(model_->getNewEventCount()); -	readButton_->setEnabled(model_->rowCount() > 0); +    view_->clearSelection(); +    model_->removeEvent(event); +    emit onNewEventCountUpdated(model_->getNewEventCount()); +    readButton_->setEnabled(model_->rowCount() > 0);  }  } | 
 Swift
 Swift