diff options
Diffstat (limited to 'knewsticker')
| -rw-r--r-- | knewsticker/common/configaccess.cpp | 4 | ||||
| -rw-r--r-- | knewsticker/common/newsengine.cpp | 16 | ||||
| -rw-r--r-- | knewsticker/common/newsengine.h | 8 | ||||
| -rw-r--r-- | knewsticker/common/newsiconmgr.cpp | 4 | ||||
| -rw-r--r-- | knewsticker/knewsticker.cpp | 2 | ||||
| -rw-r--r-- | knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp | 2 | ||||
| -rw-r--r-- | knewsticker/newsscroller.cpp | 2 |
7 files changed, 19 insertions, 19 deletions
diff --git a/knewsticker/common/configaccess.cpp b/knewsticker/common/configaccess.cpp index aba34266..d0b8480e 100644 --- a/knewsticker/common/configaccess.cpp +++ b/knewsticker/common/configaccess.cpp @@ -438,7 +438,7 @@ void ConfigAccess::setMouseWheelSpeed(const unsigned int mouseWheelSpeed) TQFont ConfigAccess::font() const { - TQFont font = KGlobalSettings::fixedFont(); + TQFont font = TDEGlobalSettings::fixedFont(); return m_cfg->readFontEntry("Font", &font); } @@ -594,7 +594,7 @@ NewsSourceBase *ConfigAccess::newsSource(const TQString &newsSource) nsd = NewsSourceDefault[i]; if (nsd.enabled) nsd.enabled = (nsd.language == TQString::fromLatin1("C") || - KGlobal::locale()->languageList().contains(nsd.language)); + TDEGlobal::locale()->languageList().contains(nsd.language)); break; } diff --git a/knewsticker/common/newsengine.cpp b/knewsticker/common/newsengine.cpp index 911095d9..e503c7b1 100644 --- a/knewsticker/common/newsengine.cpp +++ b/knewsticker/common/newsengine.cpp @@ -178,13 +178,13 @@ void SourceFileNewsSource::retrieveNews() ProgramNewsSource::ProgramNewsSource(const NewsSourceBase::Data &nsd, ConfigIface *config) : NewsSourceBase(nsd, config), - m_program(new KProcess()), + m_program(new TDEProcess()), m_programOutput(0) { - connect(m_program, TQT_SIGNAL(processExited(KProcess *)), - TQT_SLOT(slotProgramExited(KProcess *))); - connect(m_program, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - TQT_SLOT(slotGotProgramOutput(KProcess *, char *, int))); + connect(m_program, TQT_SIGNAL(processExited(TDEProcess *)), + TQT_SLOT(slotProgramExited(TDEProcess *))); + connect(m_program, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQT_SLOT(slotGotProgramOutput(TDEProcess *, char *, int))); m_data.sourceFile = KURL(m_data.sourceFile).encodedPathAndQuery(); } @@ -201,15 +201,15 @@ void ProgramNewsSource::retrieveNews() m_programOutput->open(IO_WriteOnly); *m_program << m_data.sourceFile; - m_program->start(KProcess::NotifyOnExit, KProcess::Stdout); + m_program->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } -void ProgramNewsSource::slotGotProgramOutput(KProcess *, char *data, int length) +void ProgramNewsSource::slotGotProgramOutput(TDEProcess *, char *data, int length) { m_programOutput->writeBlock(data, length); } -void ProgramNewsSource::slotProgramExited(KProcess *proc) +void ProgramNewsSource::slotProgramExited(TDEProcess *proc) { bool okSoFar = true; diff --git a/knewsticker/common/newsengine.h b/knewsticker/common/newsengine.h index b5576543..e9175317 100644 --- a/knewsticker/common/newsengine.h +++ b/knewsticker/common/newsengine.h @@ -33,7 +33,7 @@ class NewsSourceBase; class TQBuffer; class TQDomDocument; -class KProcess; +class TDEProcess; class KURL; class KDE_EXPORT Article : public XMLNewsArticle, public KShared @@ -193,13 +193,13 @@ class KDE_EXPORT ProgramNewsSource : public NewsSourceBase virtual void retrieveNews(); protected slots: - void slotGotProgramOutput(KProcess *, char *, int); - void slotProgramExited(KProcess *); + void slotGotProgramOutput(TDEProcess *, char *, int); + void slotProgramExited(TDEProcess *); private: static TQString errorMessage(const ErrorCode); - KProcess *m_program; + TDEProcess *m_program; TQBuffer *m_programOutput; }; diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp index 6e8e88d7..d37a9227 100644 --- a/knewsticker/common/newsiconmgr.cpp +++ b/knewsticker/common/newsiconmgr.cpp @@ -84,7 +84,7 @@ void NewsIconMgr::getIcon(const KURL &url) ds << url; kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data); } else { - emit gotIcon(url, TQPixmap(KGlobal::dirs()->findResource("cache", + emit gotIcon(url, TQPixmap(TDEGlobal::dirs()->findResource("cache", TQString::fromLatin1("favicons/%1.png").arg(url.host())))); } } else { @@ -132,7 +132,7 @@ void NewsIconMgr::slotGotIcon(bool isHost, TQString hostOrURL, TQString iconName if (iconName.isNull()) emit gotIcon(url, m_stdIcon); else - emit gotIcon(url, TQPixmap(KGlobal::dirs()->findResource("cache", + emit gotIcon(url, TQPixmap(TDEGlobal::dirs()->findResource("cache", TQString::fromLatin1("favicons/%1.png").arg(url.host())))); } diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp index 46930a5a..3e72fa1e 100644 --- a/knewsticker/knewsticker.cpp +++ b/knewsticker/knewsticker.cpp @@ -535,7 +535,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString &configFile) { - KGlobal::locale()->insertCatalogue(TQString::fromLatin1("knewsticker")); + TDEGlobal::locale()->insertCatalogue(TQString::fromLatin1("knewsticker")); return new KNewsTicker(configFile, KPanelApplet::Stretch, KPanelApplet::Preferences | KPanelApplet::About | KPanelApplet::Help | KPanelApplet::ReportBug, diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp index a2de376e..a6927527 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp @@ -122,7 +122,7 @@ extern "C" { KDE_EXPORT void *init_libkntsrcfilepropsdlg() { - KGlobal::locale()->insertCatalogue( "knewsticker" ); + TDEGlobal::locale()->insertCatalogue( "knewsticker" ); return new KntSrcFilePropsFactory(); } } diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp index df4ede38..c06be284 100644 --- a/knewsticker/newsscroller.cpp +++ b/knewsticker/newsscroller.cpp @@ -308,7 +308,7 @@ void NewsScroller::mouseMoveEvent(TQMouseEvent *e) else dragDistance = TQABS(e->y() - m_dragPos.y()); m_mouseDrag = (e->state() & Qt::LeftButton != 0) && - dragDistance >= KGlobal::config()->readNumEntry("StartDragDist", TDEApplication::startDragDistance()); + dragDistance >= TDEGlobal::config()->readNumEntry("StartDragDist", TDEApplication::startDragDistance()); if (m_mouseDrag) // Stop the scroller if we just started a drag. m_scrollTimer->stop(); } else { |