From d497b1b0373d758ede3d877ab68c8d7c8ab29062 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 13 Jan 2012 15:08:46 -0600 Subject: Fix inadvertent TQt changes This closes Bug 752 --- akregator/src/akregator_view.cpp | 8 ++++---- akregator/src/akregator_view.h | 2 +- akregator/src/articlefilter.cpp | 24 ++++++++++++------------ akregator/src/articlefilter.h | 8 ++++---- akregator/src/fetchqueue.h | 4 ++-- akregator/src/mainwindow.cpp | 2 +- akregator/src/mainwindow.h | 2 +- akregator/src/searchbar.cpp | 2 +- akregator/src/searchbar.h | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) (limited to 'akregator') diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index a4c1b26b4..ab0e430e2 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons if (!Settings::resetQuickFilterOnNodeChange()) { - m_searchBar->slotSeStatus(Settings::statusFilter()); + m_searchBar->slotSetStatus(Settings::statusFilter()); m_searchBar->slotSetText(Settings::textFilter()); } @@ -457,7 +457,7 @@ void View::setTabIcon(const TQPixmap& icon) void View::connectFrame(Frame *f) { - connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(sloStatusText(const TQString&))); + connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(slotStatusText(const TQString&))); connect(f, TQT_SIGNAL(captionChanged (const TQString &)), this, TQT_SLOT(slotCaptionChanged (const TQString &))); connect(f, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(slotLoadingProgress(int)) ); connect(f, TQT_SIGNAL(started()), this, TQT_SLOT(slotStarted())); @@ -465,7 +465,7 @@ void View::connectFrame(Frame *f) connect(f, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCanceled(const TQString&))); } -void View::sloStatusText(const TQString &c) +void View::slotStatusText(const TQString &c) { if (sender() == m_currentFrame) emit setStatusBarText(c); @@ -1453,7 +1453,7 @@ void View::readProperties(KConfig* config) m_searchBar->slotSetText(config->readEntry("searchLine")); int statusfilter = config->readNumEntry("searchCombo", -1); if (statusfilter != -1) - m_searchBar->slotSeStatus(statusfilter); + m_searchBar->slotSetStatus(statusfilter); } int selectedID = config->readNumEntry("selectedNodeID", -1); diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h index 6dd52f215..8237759d3 100644 --- a/akregator/src/akregator_view.h +++ b/akregator/src/akregator_view.h @@ -196,7 +196,7 @@ namespace Akregator { void slotMouseOverInfo(const KFileItem *kifi); /** sets the status bar text to a given string */ - void sloStatusText(const TQString &); + void slotStatusText(const TQString &); void slotStarted(); void slotCanceled(const TQString &); diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp index 20ebc5afc..a8bf8a365 100644 --- a/akregator/src/articlefilter.cpp +++ b/akregator/src/articlefilter.cpp @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT @@ -442,41 +442,41 @@ void DeleteAction::exec(Article& article) article.setDeleted(); } -SeStatusAction::SeStatusAction(int status) : m_status(status) +SetStatusAction::SetStatusAction(int status) : m_status(status) { } -void SeStatusAction::exec(Article& article) +void SetStatusAction::exec(Article& article) { if (!article.isNull()) article.setStatus(m_status); } -int SeStatusAction::status() const +int SetStatusAction::status() const { return m_status; } -void SeStatusAction::setStatus(int status) +void SetStatusAction::setStatus(int status) { m_status = status; } -void SeStatusAction::writeConfig(KConfig* config) const +void SetStatusAction::writeConfig(KConfig* config) const { - config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SeStatusAction")); + config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SetStatusAction")); config->writeEntry(TQString::fromLatin1("actionParams"), m_status); } -void SeStatusAction::readConfig(KConfig* config) +void SetStatusAction::readConfig(KConfig* config) { m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read); } -bool SeStatusAction::operator==(const AbstractAction& other) +bool SetStatusAction::operator==(const AbstractAction& other) { AbstractAction* ptr = const_cast(&other); - SeStatusAction* o = dynamic_cast(ptr); + SetStatusAction* o = dynamic_cast(ptr); if (!o) return false; else @@ -681,8 +681,8 @@ void ArticleFilter::readConfig(KConfig* config) d->action = new AssignTagAction(); else if (actionType == TQString::fromLatin1("DeleteAction")) d->action = new DeleteAction(); - else if (actionType == TQString::fromLatin1("SeStatusAction")) - d->action = new SeStatusAction(); + else if (actionType == TQString::fromLatin1("SetStatusAction")) + d->action = new SetStatusAction(); if (d->action) d->action->readConfig(config); diff --git a/akregator/src/articlefilter.h b/akregator/src/articlefilter.h index 4979c76ec..d0bd00e71 100644 --- a/akregator/src/articlefilter.h +++ b/akregator/src/articlefilter.h @@ -18,7 +18,7 @@ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT @@ -166,10 +166,10 @@ class DeleteAction : public AbstractAction virtual bool operator==(const AbstractAction& other); }; -class SeStatusAction : public AbstractAction +class SetStatusAction : public AbstractAction { public: - SeStatusAction(int status=0); + SetStatusAction(int status=0); virtual void exec(Article& article); @@ -179,7 +179,7 @@ class SeStatusAction : public AbstractAction virtual void writeConfig(KConfig* config) const; virtual void readConfig(KConfig* config); - virtual SeStatusAction* clone() const { return new SeStatusAction(*this); } + virtual SetStatusAction* clone() const { return new SetStatusAction(*this); } virtual bool operator==(const AbstractAction& other); private: diff --git a/akregator/src/fetchqueue.h b/akregator/src/fetchqueue.h index 149ad6c1f..3b507b8bd 100644 --- a/akregator/src/fetchqueue.h +++ b/akregator/src/fetchqueue.h @@ -23,8 +23,8 @@ without including the source code for TQt in the source distribution. */ -#ifndef AKREGATOR_FETCHTQUEUE_H -#define AKREGATOR_FETCHTQUEUE_H +#ifndef AKREGATOR_FETCHQUEUE_H +#define AKREGATOR_FETCHQUEUE_H #include diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index 77260872f..01b479baf 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -277,7 +277,7 @@ void MainWindow::slotClearStatusText() m_statusLabel->setText(TQString()); } -void MainWindow::slotSeStatusBarText( const TQString & text ) +void MainWindow::slotSetStatusBarText( const TQString & text ) { m_statusLabel->setText(text); } diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h index e21e330f6..e5f90cf4b 100644 --- a/akregator/src/mainwindow.h +++ b/akregator/src/mainwindow.h @@ -95,7 +95,7 @@ public: public slots: void slotClearStatusText(); - void slotSeStatusBarText(const TQString &c); + void slotSetStatusBarText(const TQString &c); protected: /** diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp index 6fc5a6bd7..e40b50b2b 100644 --- a/akregator/src/searchbar.cpp +++ b/akregator/src/searchbar.cpp @@ -144,7 +144,7 @@ void SearchBar::slotClearSearch() } } -void SearchBar::slotSeStatus(int status) +void SearchBar::slotSetStatus(int status) { d->searchCombo->setCurrentItem(status); slotSearchComboChanged(status); diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h index a13a78ca0..ee919ae6b 100644 --- a/akregator/src/searchbar.h +++ b/akregator/src/searchbar.h @@ -59,7 +59,7 @@ class SearchBar : public TQHBox public slots: void slotClearSearch(); - void slotSeStatus(int status); + void slotSetStatus(int status); void slotSetText(const TQString& text); private slots: -- cgit v1.2.1