diff options
Diffstat (limited to 'src/komposeglobal.cpp')
| -rw-r--r-- | src/komposeglobal.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/komposeglobal.cpp b/src/komposeglobal.cpp index 7d7dbe3..78735ed 100644 --- a/src/komposeglobal.cpp +++ b/src/komposeglobal.cpp @@ -82,12 +82,12 @@ KomposeGlobal::KomposeGlobal(TQObject *parent, const char *name) currentDesktop = twin_module->currentDesktop(); desktopBgPixmap = new TDESharedPixmap; - connect(desktopBgPixmap, SIGNAL(done(bool)), SLOT(slotDone(bool))); + connect(desktopBgPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool))); initSharedPixmaps(); initCompositeExt(); initImlib(); - connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(slotConfigChanged()) ); + connect( KomposeSettings::instance(), TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotConfigChanged()) ); } KomposeGlobal::~KomposeGlobal() @@ -154,37 +154,37 @@ void KomposeGlobal::initActions() actionCollection = new TDEActionCollection( (TQWidget*)0 ); // Actions - actQuit = KStdAction::quit( kapp, SLOT(quit()), actionCollection ); + actQuit = KStdAction::quit( kapp, TQ_SLOT(quit()), actionCollection ); actShowWorldView = new TDEAction(i18n("Komposé (ungrouped)"), "kompose_ungrouped", 0, - KomposeViewManager::instance(), SLOT(createWorldView()), + KomposeViewManager::instance(), TQ_SLOT(createWorldView()), actionCollection, "showWorldView"); actShowVirtualDesktopView = new TDEAction(i18n("Komposé (grouped by virtual desktops)"), "kompose_grouped_by_virtual_desktop", 0, - KomposeViewManager::instance(), SLOT(createVirtualDesktopView()), + KomposeViewManager::instance(), TQ_SLOT(createVirtualDesktopView()), actionCollection, "showVirtualDesktopView"); actShowCurrentDesktopView = new TDEAction(i18n("Komposé (current virtual desktop)"), "kompose_current_virtual_desktop", 0, - KomposeViewManager::instance(), SLOT(createCurrentDesktopView()), + KomposeViewManager::instance(), TQ_SLOT(createCurrentDesktopView()), actionCollection, "showCurrentDesktopView"); - actPreferencesDialog = KStdAction::preferences( KomposeSettings::instance(), SLOT(showPreferencesDlg()), actionCollection ); + actPreferencesDialog = KStdAction::preferences( KomposeSettings::instance(), TQ_SLOT(showPreferencesDlg()), actionCollection ); - actConfigGlobalShortcuts = KStdAction::keyBindings(this, SLOT(showGlobalShortcutsSettingsDialog()), + actConfigGlobalShortcuts = KStdAction::keyBindings(this, TQ_SLOT(showGlobalShortcutsSettingsDialog()), actionCollection, "options_configure_global_keybinding"); actConfigGlobalShortcuts->setText(i18n("Configure &Global Shortcuts...")); actAboutDlg = new TDEAction(i18n("About Komposé"), "kompose", 0, - this, SLOT(showAboutDlg()), + this, TQ_SLOT(showAboutDlg()), actionCollection, "showAboutDlg"); } void KomposeGlobal::initSharedPixmaps() { // Whenever the background pixmap changes we'll have to reload it: - //connect(twin_module, SIGNAL(windowChanged(WId, unsigned int)), SLOT(desktopChanged(WId, unsigned int))); - connect(twin_module, SIGNAL(currentDesktopChanged(int)), SLOT(slotDesktopChanged(int))); - connect(kapp, SIGNAL(backgroundChanged(int)), SLOT(slotBackgroundChanged(int))); + //connect(twin_module, TQ_SIGNAL(windowChanged(WId, unsigned int)), TQ_SLOT(desktopChanged(WId, unsigned int))); + connect(twin_module, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(slotDesktopChanged(int))); + connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); enablePixmapExports(); // When Kompose is started by session management the bg shared pixmap may not be available yet @@ -192,7 +192,7 @@ void KomposeGlobal::initSharedPixmaps() { tqWarning("KomposeGlobal::initSharedPixmaps() - Pixmap not available"); //enablePixmapExports(); - TQTimer::singleShot( 1000, this, SLOT( initSharedPixmaps() ) ); + TQTimer::singleShot( 1000, this, TQ_SLOT( initSharedPixmaps() ) ); //initSharedPixmaps(); //return; } @@ -246,7 +246,7 @@ void KomposeGlobal::slotDone(bool success) if (!success) { kdDebug() << "KomposeGlobal::slotDone() - loading of desktop background failed.\n" << endl; - //TQTimer::singleShot( 1000, this, SLOT( initSharedPixmaps() ) ); + //TQTimer::singleShot( 1000, this, TQ_SLOT( initSharedPixmaps() ) ); } } |