diff options
Diffstat (limited to 'akregator')
-rw-r--r-- | akregator/src/addfeeddialog.cpp | 2 | ||||
-rw-r--r-- | akregator/src/akregator_part.cpp | 14 | ||||
-rw-r--r-- | akregator/src/articleviewer.cpp | 6 | ||||
-rw-r--r-- | akregator/src/feediconmanager.cpp | 4 | ||||
-rw-r--r-- | akregator/src/librss/testlibrss.cpp | 2 | ||||
-rw-r--r-- | akregator/src/mainwindow.cpp | 8 | ||||
-rw-r--r-- | akregator/src/tabwidget.cpp | 6 | ||||
-rw-r--r-- | akregator/src/tagaction.cpp | 2 | ||||
-rw-r--r-- | akregator/src/trayicon.cpp | 4 | ||||
-rw-r--r-- | akregator/src/viewer.cpp | 2 |
10 files changed, 25 insertions, 25 deletions
diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp index a7b88a11f..1e09dc716 100644 --- a/akregator/src/addfeeddialog.cpp +++ b/akregator/src/addfeeddialog.cpp @@ -42,7 +42,7 @@ namespace Akregator { AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name) : AddFeedWidgetBase(parent, name) { - pixmapLabel1->setPixmap(kapp->iconLoader()->loadIcon( "applications-internet",TDEIcon::Desktop,TDEIcon::SizeHuge, TDEIcon::DefaultState, 0, true)); + pixmapLabel1->setPixmap(tdeApp->iconLoader()->loadIcon( "applications-internet",TDEIcon::Desktop,TDEIcon::SizeHuge, TDEIcon::DefaultState, 0, true)); statusLabel->setText(TQString()); } diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index 52b46a051..36afe37c4 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -220,11 +220,11 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, NotificationManager::self()->setWidget(getMainWindow(), instance()); connect( trayIcon, TQ_SIGNAL(quitSelected()), - kapp, TQ_SLOT(quit())) ; + tdeApp, TQ_SLOT(quit())) ; connect( m_view, TQ_SIGNAL(signalUnreadCountChanged(int)), trayIcon, TQ_SLOT(slotSetUnread(int)) ); - connect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(slotOnShutdown())); + connect(tdeApp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(slotOnShutdown())); m_autosaveTimer = new TQTimer(this); connect(m_autosaveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSaveFeedList())); @@ -530,7 +530,7 @@ TQWidget* Part::getMainWindow() { // this is a dirty fix to get the main window used for the tray icon - TQWidgetList *l = kapp->topLevelWidgets(); + TQWidgetList *l = tdeApp->topLevelWidgets(); TQWidgetListIt it( *l ); TQWidget *wid; @@ -721,7 +721,7 @@ void Part::fileSendArticle(bool attach) title = m_view->currentFrame()->title(); if(attach) { - kapp->invokeMailer("", + tdeApp->invokeMailer("", "", "", title, @@ -730,7 +730,7 @@ void Part::fileSendArticle(bool attach) text); } else { - kapp->invokeMailer("", + tdeApp->invokeMailer("", "", "", title, @@ -946,12 +946,12 @@ static TQString getMyHostName() bool Part::tryToLock(const TQString& backendName) { // Check and create a lock file to prevent concurrent access to metakit archive - TQString appName = kapp->instanceName(); + TQString appName = tdeApp->instanceName(); if ( appName.isEmpty() ) appName = "akregator"; TQString programName; - const TDEAboutData *about = kapp->aboutData(); + const TDEAboutData *about = tdeApp->aboutData(); if ( about ) programName = about->programName(); if ( programName.isEmpty() ) diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index 073a638ff..cf195cd5c 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -175,8 +175,8 @@ ArticleViewer::ArticleViewer(TQWidget *parent, const char *name) connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); - connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) ); - connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) ); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) ); + connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) ); m_imageDir.setPath(TDEGlobal::dirs()->saveLocation("cache", "akregator/Media/")); m_htmlFooter = "</body></html>"; @@ -370,7 +370,7 @@ void ArticleViewer::displayAboutPage() TQString location = locate("data", "akregator/about/main.html"); TQString content = KPIM::kFileToString(location); content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); - if ( kapp->reverseLayout() ) + if ( tdeApp->reverseLayout() ) content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else content = content.arg( "" ); diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp index 513f845fa..a6890e2be 100644 --- a/akregator/src/feediconmanager.cpp +++ b/akregator/src/feediconmanager.cpp @@ -95,7 +95,7 @@ void FeedIconManager::loadIcon(const TQString & url) TQByteArray data; TQDataStream ds(data, IO_WriteOnly); ds << u; - kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", + tdeApp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data); } else @@ -116,7 +116,7 @@ TQString FeedIconManager::iconLocation(const KURL & url) const ds << url; - kapp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data, + tdeApp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data, replyType, reply); if (replyType == "TQString") { diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp index 4515cf7e0..a6e970e2c 100644 --- a/akregator/src/librss/testlibrss.cpp +++ b/akregator/src/librss/testlibrss.cpp @@ -53,7 +53,7 @@ void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status ) if ( status != Success ) kdDebug() << "ERROR " << loader->errorCode() << endl; - kapp->quit(); + tdeApp->quit(); } int main( int argc, char **argv ) diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index e5c138679..27fa8560f 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -154,7 +154,7 @@ void MainWindow::setupActions() { connectActionCollection(actionCollection()); - KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); setStandardToolBarMenuEnabled(true); createStandardStatusBarAction(); @@ -235,7 +235,7 @@ void MainWindow::connectActionCollection( TDEActionCollection *coll ) bool MainWindow::queryExit() { kdDebug() << "MainWindow::queryExit()" << endl; - if ( !kapp->sessionSaving() ) + if ( !tdeApp->sessionSaving() ) { delete m_part; // delete that here instead of dtor to ensure nested tdehtmlparts are deleted before singleton objects like TDEHTMLPageCache m_part = 0; @@ -250,12 +250,12 @@ void MainWindow::slotQuit() { if (TrayIcon::getInstance()) TrayIcon::getInstance()->hide(); - kapp->quit(); + tdeApp->quit(); } bool MainWindow::queryClose() { - if (kapp->sessionSaving() || TrayIcon::getInstance() == 0 || TrayIcon::getInstance()->isHidden() ) + if (tdeApp->sessionSaving() || TrayIcon::getInstance() == 0 || TrayIcon::getInstance()->isHidden() ) { return true; } diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index b1cbf9c52..f1f1bb895 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -269,7 +269,7 @@ void TabWidget::slotDetachTab() url = view->part()->url(); - kapp->invokeBrowser(url.url(), "0"); + tdeApp->invokeBrowser(url.url(), "0"); slotCloseTab(); } @@ -288,8 +288,8 @@ void TabWidget::slotCopyLinkAddress() url = view->part()->url(); - kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection); - kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard); + tdeApp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection); + tdeApp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard); } void TabWidget::slotCloseTab() diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp index 728bf0abc..b4a252a5f 100644 --- a/akregator/src/tagaction.cpp +++ b/akregator/src/tagaction.cpp @@ -86,7 +86,7 @@ int TagAction::plug(TQWidget* widget, int index) kdWarning() << "Can not plug TDEToggleAction in " << widget->className() << endl; return -1; } - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; TagMenuItem* item = new TagMenuItem(d->tag); diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp index 5d04d549c..fe816d19c 100644 --- a/akregator/src/trayicon.cpp +++ b/akregator/src/trayicon.cpp @@ -85,8 +85,8 @@ void TrayIcon::mousePressEvent(TQMouseEvent *e) { TQPixmap TrayIcon::takeScreenshot() const { TQPoint g = mapToGlobal(pos()); - int desktopWidth = kapp->desktop()->width(); - int desktopHeight = kapp->desktop()->height(); + int desktopWidth = tdeApp->desktop()->width(); + int desktopHeight = tdeApp->desktop()->height(); int tw = width(); int th = height(); int w = desktopWidth / 4; diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index f5d326e95..da06562d0 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -104,7 +104,7 @@ void Viewer::displayInExternalBrowser(const KURL &url, const TQString &mimetype) if (Settings::externalBrowserUseTdeDefault()) { if (mimetype.isEmpty()) - kapp->invokeBrowser(url.url(), "0"); + tdeApp->invokeBrowser(url.url(), "0"); else KRun::runURL(url, mimetype, false, false); } |