diff options
Diffstat (limited to 'akregator/src/akregator_part.cpp')
-rw-r--r-- | akregator/src/akregator_part.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index d7ca0d44..14562fc8 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -33,14 +33,14 @@ #include <tdefiledialog.h> #include <tdeglobalsettings.h> #include <tdehtmldefaults.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdemainwindow.h> #include <tdemessagebox.h> #include <knotifyclient.h> #include <knotifydialog.h> #include <tdepopupmenu.h> #include <kservice.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdaction.h> #include <tdetempfile.h> #include <ktrader.h> @@ -54,7 +54,7 @@ #include <tqstringlist.h> #include <tqtimer.h> #include <tqwidgetlist.h> -#include <tqucomextra_p.h> +#include <private/tqucomextra_p.h> #include <cerrno> #include <sys/types.h> @@ -195,12 +195,12 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, m_extension = new BrowserExtension(this, "ak_extension"); - connect(m_view, TQT_SIGNAL(setWindowCaption(const TQString&)), this, TQT_SIGNAL(setWindowCaption(const TQString&))); - connect(m_view, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&))); - connect(m_view, TQT_SIGNAL(setProgress(int)), m_extension, TQT_SIGNAL(loadingProgress(int))); - connect(m_view, TQT_SIGNAL(signalCanceled(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&))); - connect(m_view, TQT_SIGNAL(signalStarted(TDEIO::Job*)), this, TQT_SIGNAL(started(TDEIO::Job*))); - connect(m_view, TQT_SIGNAL(signalCompleted()), this, TQT_SIGNAL(completed())); + connect(m_view, TQ_SIGNAL(setWindowCaption(const TQString&)), this, TQ_SIGNAL(setWindowCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(setStatusBarText(const TQString&)), this, TQ_SIGNAL(setStatusBarText(const TQString&))); + connect(m_view, TQ_SIGNAL(setProgress(int)), m_extension, TQ_SIGNAL(loadingProgress(int))); + connect(m_view, TQ_SIGNAL(signalCanceled(const TQString&)), this, TQ_SIGNAL(canceled(const TQString&))); + connect(m_view, TQ_SIGNAL(signalStarted(TDEIO::Job*)), this, TQ_SIGNAL(started(TDEIO::Job*))); + connect(m_view, TQ_SIGNAL(signalCompleted()), this, TQ_SIGNAL(completed())); // notify the part that this is our internal widget setWidget(m_view); @@ -209,7 +209,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, TrayIcon::setInstance(trayIcon); m_actionManager->initTrayIcon(trayIcon); - connect(trayIcon, TQT_SIGNAL(showPart()), this, TQT_SIGNAL(showPart())); + connect(trayIcon, TQ_SIGNAL(showPart()), this, TQ_SIGNAL(showPart())); if ( isTrayIconEnabled() ) { @@ -219,15 +219,15 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, else NotificationManager::self()->setWidget(getMainWindow(), instance()); - connect( trayIcon, TQT_SIGNAL(quitSelected()), - kapp, TQT_SLOT(quit())) ; + connect( trayIcon, TQ_SIGNAL(quitSelected()), + tdeApp, TQ_SLOT(quit())) ; - connect( m_view, TQT_SIGNAL(signalUnreadCountChanged(int)), trayIcon, TQT_SLOT(slotSetUnread(int)) ); + connect( m_view, TQ_SIGNAL(signalUnreadCountChanged(int)), trayIcon, TQ_SLOT(slotSetUnread(int)) ); - connect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(slotOnShutdown())); + connect(tdeApp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(slotOnShutdown())); m_autosaveTimer = new TQTimer(this); - connect(m_autosaveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSaveFeedList())); + connect(m_autosaveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSaveFeedList())); m_autosaveTimer->start(5*60*1000); // 5 minutes setXMLFile("akregator_part.rc", true); @@ -255,7 +255,7 @@ void Part::slotOnShutdown() m_shuttingDown = true; const TQString lockLocation = locateLocal("data", "akregator/lock"); - KSimpleConfig config(lockLocation); + TDESimpleConfig config(lockLocation); config.writeEntry("pid", -1); config.sync(); @@ -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, @@ -782,10 +782,10 @@ void Part::showOptions() TDEConfigDialog* dialog = new ConfigDialog( m_view, "settings", Settings::self() ); - connect( dialog, TQT_SIGNAL(settingsChanged()), - this, TQT_SLOT(slotSettingsChanged()) ); - connect( dialog, TQT_SIGNAL(settingsChanged()), - TrayIcon::getInstance(), TQT_SLOT(settingsChanged()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), + this, TQ_SLOT(slotSettingsChanged()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), + TrayIcon::getInstance(), TQ_SLOT(settingsChanged()) ); dialog->show(); } @@ -946,19 +946,19 @@ 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() ) programName = i18n("Akregator"); TQString lockLocation = locateLocal("data", "akregator/lock"); - KSimpleConfig config(lockLocation); + TDESimpleConfig config(lockLocation); int oldPid = config.readNumEntry("pid", -1); const TQString oldHostName = config.readEntry("hostname"); const TQString oldAppName = config.readEntry( "appName", appName ); @@ -982,7 +982,7 @@ bool Part::tryToLock(const TQString& backendName) { // this can only happen if the user is running this application on // different displays on the same machine. All other cases will be - // taken care of by KUniqueApplication() + // taken care of by TDEUniqueApplication() if ( oldAppName == appName ) msg = i18n("<qt>%1 already seems to be running on another display on " "this machine. <b>Running %2 more than once is not supported " |