diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/application.cpp | 2 | ||||
| -rw-r--r-- | src/backgroundmanager.cpp | 2 | ||||
| -rw-r--r-- | src/backup.cpp | 8 | ||||
| -rw-r--r-- | src/basket.cpp | 120 | ||||
| -rw-r--r-- | src/basket_part.cpp | 4 | ||||
| -rw-r--r-- | src/basketlistview.cpp | 2 | ||||
| -rw-r--r-- | src/basketproperties.cpp | 4 | ||||
| -rw-r--r-- | src/basketstatusbar.cpp | 2 | ||||
| -rw-r--r-- | src/bnpview.cpp | 248 | ||||
| -rw-r--r-- | src/colorpicker.cpp | 2 | ||||
| -rw-r--r-- | src/filter.cpp | 24 | ||||
| -rw-r--r-- | src/formatimporter.cpp | 4 | ||||
| -rw-r--r-- | src/kiconcanvas.cpp | 6 | ||||
| -rw-r--r-- | src/kicondialog.cpp | 24 | ||||
| -rw-r--r-- | src/likeback.cpp | 24 | ||||
| -rw-r--r-- | src/linklabel.cpp | 30 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 20 | ||||
| -rw-r--r-- | src/newbasketdialog.cpp | 12 | ||||
| -rw-r--r-- | src/notecontent.cpp | 20 | ||||
| -rw-r--r-- | src/notedrag.cpp | 8 | ||||
| -rw-r--r-- | src/noteedit.cpp | 98 | ||||
| -rw-r--r-- | src/notefactory.cpp | 16 | ||||
| -rw-r--r-- | src/qeffects.cpp | 4 | ||||
| -rw-r--r-- | src/regiongrabber.cpp | 4 | ||||
| -rw-r--r-- | src/settings.cpp | 88 | ||||
| -rw-r--r-- | src/softwareimporters.cpp | 2 | ||||
| -rw-r--r-- | src/systemtray.cpp | 8 | ||||
| -rw-r--r-- | src/tag.cpp | 2 | ||||
| -rw-r--r-- | src/tagsedit.cpp | 72 | ||||
| -rw-r--r-- | src/variouswidgets.cpp | 14 |
30 files changed, 437 insertions, 437 deletions
diff --git a/src/application.cpp b/src/application.cpp index fb361cd..6393bd1 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -55,7 +55,7 @@ int Application::newInstance() // Tags are not loaded until Global::bnpView::lateInit() is called. // It is called 0ms after the application start. BNPView::s_fileToOpen = fileName; - TQTimer::singleShot( 100, Global::bnpView, TQT_SLOT(delayedOpenArchive()) ); + TQTimer::singleShot( 100, Global::bnpView, TQ_SLOT(delayedOpenArchive()) ); // Global::bnpView->openArchive(fileName); args->clear(); } diff --git a/src/backgroundmanager.cpp b/src/backgroundmanager.cpp index 74a185f..5cc9dd6 100644 --- a/src/backgroundmanager.cpp +++ b/src/backgroundmanager.cpp @@ -83,7 +83,7 @@ BackgroundManager::BackgroundManager() /// for (BackgroundsList::Iterator it = m_backgroundsList.begin(); it != m_backgroundsList.end(); ++it) /// std::cout << "* " << (*it)->location << " [ref: " << (*it)->name << "]" << std::endl; - connect( &m_garbageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doGarbage()) ); + connect( &m_garbageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doGarbage()) ); } BackgroundManager::~BackgroundManager() diff --git a/src/backup.cpp b/src/backup.cpp index 8992a78..d770f1d 100644 --- a/src/backup.cpp +++ b/src/backup.cpp @@ -89,8 +89,8 @@ BackupDialog::BackupDialog(TQWidget *parent, const char *name) folderLayout->addWidget(useFolder); folderLayout->addWidget(helpLabel); folderLayout->addStretch(); - connect( moveFolder, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveToAnotherFolder()) ); - connect( useFolder, TQT_SIGNAL(clicked()), this, TQT_SLOT(useAnotherExistingFolder()) ); + connect( moveFolder, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveToAnotherFolder()) ); + connect( useFolder, TQ_SIGNAL(clicked()), this, TQ_SLOT(useAnotherExistingFolder()) ); TQGroupBox *backupGroup = new TQGroupBox(1, TQt::Horizontal, i18n("Backups"), page); TQWidget *backupWidget = new TQWidget(backupGroup); @@ -102,8 +102,8 @@ BackupDialog::BackupDialog(TQWidget *parent, const char *name) backupLayout->addWidget(restoreButton); backupLayout->addWidget(m_lastBackup); backupLayout->addStretch(); - connect( backupButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(backup()) ); - connect( restoreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(restore()) ); + connect( backupButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(backup()) ); + connect( restoreButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(restore()) ); populateLastBackup(); diff --git a/src/basket.cpp b/src/basket.cpp index f6f76d7..75dc8ca 100644 --- a/src/basket.cpp +++ b/src/basket.cpp @@ -202,13 +202,13 @@ DecoratedBasket::DecoratedBasket(TQWidget *parent, const TQString &folderName, c m_filter->setShown(true); m_basket->setFocus(); // To avoid the filter bar have focus on load - connect( m_filter, TQT_SIGNAL(newFilter(const FilterData&)), m_basket, TQT_SLOT(newFilter(const FilterData&)) ); - connect( m_filter, TQT_SIGNAL(escapePressed()), m_basket, TQT_SLOT(cancelFilter()) ); - connect( m_filter, TQT_SIGNAL(returnPressed()), m_basket, TQT_SLOT(validateFilter()) ); + connect( m_filter, TQ_SIGNAL(newFilter(const FilterData&)), m_basket, TQ_SLOT(newFilter(const FilterData&)) ); + connect( m_filter, TQ_SIGNAL(escapePressed()), m_basket, TQ_SLOT(cancelFilter()) ); + connect( m_filter, TQ_SIGNAL(returnPressed()), m_basket, TQ_SLOT(validateFilter()) ); - connect( m_basket, TQT_SIGNAL(postMessage(const TQString&)), Global::bnpView, TQT_SLOT(postStatusbarMessage(const TQString&)) ); - connect( m_basket, TQT_SIGNAL(setStatusBarText(const TQString&)), Global::bnpView, TQT_SLOT(setStatusBarHint(const TQString&)) ); - connect( m_basket, TQT_SIGNAL(resetStatusBarText()), Global::bnpView, TQT_SLOT(updateStatusBarHint()) ); + connect( m_basket, TQ_SIGNAL(postMessage(const TQString&)), Global::bnpView, TQ_SLOT(postStatusbarMessage(const TQString&)) ); + connect( m_basket, TQ_SIGNAL(setStatusBarText(const TQString&)), Global::bnpView, TQ_SLOT(setStatusBarHint(const TQString&)) ); + connect( m_basket, TQ_SIGNAL(resetStatusBarText()), Global::bnpView, TQ_SLOT(updateStatusBarHint()) ); } DecoratedBasket::~DecoratedBasket() @@ -1124,7 +1124,7 @@ void Basket::aboutToBeActivated() setFocusedNote(0); // So that during the focusInEvent that will come shortly, the FIRST note is focused. if (Settings::playAnimations() && !decoration()->filterBar()->filterData().isFiltering && Global::bnpView->currentBasket() == this) // No animation when filtering all! - animateLoad();//TQTimer::singleShot( 0, this, TQT_SLOT(animateLoad()) ); + animateLoad();//TQTimer::singleShot( 0, this, TQ_SLOT(animateLoad()) ); m_finishLoadOnFirstShow = false; } @@ -1216,7 +1216,7 @@ void Basket::load() focusANote(); if (Settings::playAnimations() && !decoration()->filterBar()->filterData().isFiltering && Global::bnpView->currentBasket() == this) // No animation when filtering all! - animateLoad();//TQTimer::singleShot( 0, this, TQT_SLOT(animateLoad()) ); + animateLoad();//TQTimer::singleShot( 0, this, TQ_SLOT(animateLoad()) ); else m_loaded = true; enableActions(); @@ -1232,7 +1232,7 @@ void Basket::filterAgain(bool andEnsureVisible/* = true*/) void Basket::filterAgainDelayed() { - TQTimer::singleShot( 0, this, TQT_SLOT(filterAgain()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(filterAgain()) ); } void Basket::newFilter(const FilterData &data, bool andEnsureVisible/* = true*/) @@ -1308,7 +1308,7 @@ void Basket::setShortcut(TDEShortcut shortcut, int action) m_shortcutAction = action; if (action > 0) - Global::globalAccel->insert(sAction, m_action->text(), /*whatsThis=*/"", m_action->shortcut(), TDEShortcut(), this, TQT_SLOT(activatedShortcut()), /*configurable=*/false); + Global::globalAccel->insert(sAction, m_action->text(), /*whatsThis=*/"", m_action->shortcut(), TDEShortcut(), this, TQ_SLOT(activatedShortcut()), /*configurable=*/false); Global::globalAccel->updateConnections(); } @@ -1357,7 +1357,7 @@ Basket::Basket(TQWidget *parent, const TQString &folderName) m_finishLoadOnFirstShow(false), m_relayoutOnNextShow(false) { TQString sAction = "local_basket_activate_" + folderName; - m_action = new TDEAction("FAKE TEXT", "FAKE ICON", TDEShortcut(), this, TQT_SLOT(activatedShortcut()), Global::bnpView->actionCollection(), sAction.utf8()); + m_action = new TDEAction("FAKE TEXT", "FAKE ICON", TDEShortcut(), this, TQ_SLOT(activatedShortcut()), Global::bnpView->actionCollection(), sAction.utf8()); m_action->setShortcutConfigurable(false); // We do it in the basket properties dialog (and keep it in sync with the global one) if (!m_folderName.endsWith("/")) @@ -1378,17 +1378,17 @@ Basket::Basket(TQWidget *parent, const TQString &folderName) // File Watcher: m_watcher = new KDirWatch(this); - connect( m_watcher, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(watchedFileModified(const TQString&)) ); - connect( m_watcher, TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(watchedFileDeleted(const TQString&)) ); - connect( &m_watcherTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateModifiedNotes()) ); + connect( m_watcher, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(watchedFileModified(const TQString&)) ); + connect( m_watcher, TQ_SIGNAL(deleted(const TQString&)), this, TQ_SLOT(watchedFileDeleted(const TQString&)) ); + connect( &m_watcherTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateModifiedNotes()) ); // Various Connections: - connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animateObjects()) ); - connect( &m_autoScrollSelectionTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doAutoScrollSelection()) ); - connect( &m_timerCountsChanged, TQT_SIGNAL(timeout()), this, TQT_SLOT(countsChangedTimeOut()) ); - connect( &m_inactivityAutoSaveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(inactivityAutoSaveTimeout()) ); - connect( &m_inactivityAutoLockTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(inactivityAutoLockTimeout()) ); - connect( this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(contentsMoved()) ); + connect( &m_animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(animateObjects()) ); + connect( &m_autoScrollSelectionTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doAutoScrollSelection()) ); + connect( &m_timerCountsChanged, TQ_SIGNAL(timeout()), this, TQ_SLOT(countsChangedTimeOut()) ); + connect( &m_inactivityAutoSaveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(inactivityAutoSaveTimeout()) ); + connect( &m_inactivityAutoLockTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(inactivityAutoLockTimeout()) ); + connect( this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(contentsMoved()) ); #ifdef HAVE_LIBGPGME m_gpg = new KGpgMe(); #endif @@ -1398,7 +1398,7 @@ Basket::Basket(TQWidget *parent, const TQString &folderName) void Basket::contentsMoved() { // This slot is called BEFORE the content move, so we delay the hover effects: - TQTimer::singleShot(0, this, TQT_SLOT(doHoverEffects())); + TQTimer::singleShot(0, this, TQ_SLOT(doHoverEffects())); } void Basket::enterEvent(TQEvent *) @@ -1443,7 +1443,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event) // the interface flicker by showing the focused rectangle (as the basket gets focus) // and immediatly removing it (because the popup menu now have focus). if (!isDuringEdit()) - TQTimer::singleShot(0, this, TQT_SLOT(setFocusIfNotInPopupMenu())); + TQTimer::singleShot(0, this, TQ_SLOT(setFocusIfNotInPopupMenu())); // Convenient variables: bool controlPressed = event->stateAfter() & TQt::ControlButton; @@ -1587,10 +1587,10 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event) menu->removeItem(/*id=*/120); menu->insertTitle((zone == Note::TopGroup || zone == Note::BottomGroup ? i18n("The verb (Group New Note)", "Group") : i18n("The verb (Insert New Note)", "Insert")), /*id=*/120, /*index=*/0); setInsertPopupMenu(); - connect( menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(delayedCancelInsertPopupMenu()) ); - connect( menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(unlockHovering()) ); - connect( menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(disableNextClick()) ); - connect( menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(hideInsertPopupMenu()) ); + connect( menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(delayedCancelInsertPopupMenu()) ); + connect( menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(unlockHovering()) ); + connect( menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(disableNextClick()) ); + connect( menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(hideInsertPopupMenu()) ); doHoverEffects(clicked, zone); // In the case where another popup menu was open, we should do that manually! m_lockedHovering = true; menu->exec(TQCursor::pos()); @@ -1609,8 +1609,8 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event) } m_startOfShiftSelectionNote = (clicked->isGroup() ? clicked->firstRealChild() : clicked); TQPopupMenu* menu = Global::bnpView->popupMenu("note_popup"); - connect( menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(unlockHovering()) ); - connect( menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(disableNextClick()) ); + connect( menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(unlockHovering()) ); + connect( menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(disableNextClick()) ); doHoverEffects(clicked, zone); // In the case where another popup menu was open, we should do that manually! m_lockedHovering = true; menu->exec(TQCursor::pos()); @@ -1690,7 +1690,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event) void Basket::delayedCancelInsertPopupMenu() { - TQTimer::singleShot( 0, this, TQT_SLOT(cancelInsertPopupMenu()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(cancelInsertPopupMenu()) ); } void Basket::contentsContextMenuEvent(TQContextMenuEvent *event) @@ -1700,9 +1700,9 @@ void Basket::contentsContextMenuEvent(TQContextMenuEvent *event) TQRect basketRect( mapToGlobal(TQPoint(0,0)), size() ); TQPopupMenu *menu = Global::bnpView->popupMenu("insert_popup"); setInsertPopupMenu(); - connect( menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(delayedCancelInsertPopupMenu()) ); - connect( menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(unlockHovering()) ); - connect( menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(disableNextClick()) ); + connect( menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(delayedCancelInsertPopupMenu()) ); + connect( menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(unlockHovering()) ); + connect( menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(disableNextClick()) ); removeInserter(); m_lockedHovering = true; PopupMenu::execAtRectCenter(*menu, basketRect); // Popup at center or the basket @@ -1713,8 +1713,8 @@ void Basket::contentsContextMenuEvent(TQContextMenuEvent *event) m_startOfShiftSelectionNote = (m_focusedNote->isGroup() ? m_focusedNote->firstRealChild() : m_focusedNote); // Popup at bottom (or top) of the focused note, if visible : TQPopupMenu *menu = Global::bnpView->popupMenu("note_popup"); - connect( menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(unlockHovering()) ); - connect( menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(disableNextClick()) ); + connect( menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(unlockHovering()) ); + connect( menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(disableNextClick()) ); doHoverEffects(m_focusedNote, Note::Content); // In the case where another popup menu was open, we should do that manually! m_lockedHovering = true; PopupMenu::execAtRectBottom(*menu, noteVisibleRect(m_focusedNote), true); @@ -2147,7 +2147,7 @@ void Basket::resetInsertionData() void Basket::hideInsertPopupMenu() { - TQTimer::singleShot( 50/*ms*/, this, TQT_SLOT(timeoutHideInsertPopupMenu()) ); + TQTimer::singleShot( 50/*ms*/, this, TQ_SLOT(timeoutHideInsertPopupMenu()) ); } void Basket::timeoutHideInsertPopupMenu() @@ -3041,7 +3041,7 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i void Basket::unlock() { - TQTimer::singleShot( 0, this, TQT_SLOT(load()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(load()) ); } void Basket::inactivityAutoLockTimeout() @@ -3055,7 +3055,7 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt if (!m_loadingLaunched) { if(!m_locked) - TQTimer::singleShot( 0, this, TQT_SLOT(load()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(load()) ); else { Global::bnpView->notesStateChanged(); // Show "Locked" instead of "Loading..." in the statusbar } @@ -3079,7 +3079,7 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt m_button = new TQPushButton( m_decryptBox, "button" ); m_button->setText( i18n( "&Unlock" ) ); layout->addWidget( m_button, 1, 2 ); - connect( m_button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( unlock() ) ); + connect( m_button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( unlock() ) ); #endif TQLabel* label = new TQLabel( m_decryptBox, "label" ); TQString text = "<b>" + i18n("Password protected basket.") + "</b><br/>"; @@ -3410,9 +3410,9 @@ void Basket::popupEmblemMenu(Note *note, int emblemNumber) if (sequenceOnDelete) menu.setAccel(sequence, 1); - connect( &menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggledStateInMenu(int)) ); - connect( &menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(unlockHovering()) ); - connect( &menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(disableNextClick()) ); + connect( &menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(toggledStateInMenu(int)) ); + connect( &menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(unlockHovering()) ); + connect( &menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(disableNextClick()) ); m_lockedHovering = true; menu.exec(TQCursor::pos()); @@ -3516,9 +3516,9 @@ void Basket::popupTagsMenu(Note *note) // if (!selectedNotesHaveTags())//note->states().isEmpty()) // menu.setItemEnabled(2, false); // -// connect( &menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggledTagInMenu(int)) ); -// connect( &menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(unlockHovering()) ); -// connect( &menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(disableNextClick()) ); +// connect( &menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(toggledTagInMenu(int)) ); +// connect( &menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(unlockHovering()) ); +// connect( &menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(disableNextClick()) ); Global::bnpView->populateTagsMenu(menu, note); @@ -3835,7 +3835,7 @@ void Basket::editorCursorPositionChanged() void Basket::closeEditorDelayed() { setFocus(); - TQTimer::singleShot( 0, this, TQT_SLOT(closeEditor()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(closeEditor()) ); } bool Basket::closeEditor() @@ -3847,13 +3847,13 @@ bool Basket::closeEditor() return true; if (m_redirectEditActions) { - disconnect( m_editor->widget(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChangedInEditor()) ); + disconnect( m_editor->widget(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChangedInEditor()) ); if (m_editor->textEdit()) { - disconnect( m_editor->textEdit(), TQT_SIGNAL(textChanged()), this, TQT_SLOT(selectionChangedInEditor()) ); - disconnect( m_editor->textEdit(), TQT_SIGNAL(textChanged()), this, TQT_SLOT(contentChangedInEditor()) ); + disconnect( m_editor->textEdit(), TQ_SIGNAL(textChanged()), this, TQ_SLOT(selectionChangedInEditor()) ); + disconnect( m_editor->textEdit(), TQ_SIGNAL(textChanged()), this, TQ_SLOT(contentChangedInEditor()) ); } else if (m_editor->lineEdit()) { - disconnect( m_editor->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(selectionChangedInEditor()) ); - disconnect( m_editor->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(contentChangedInEditor()) ); + disconnect( m_editor->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(selectionChangedInEditor()) ); + disconnect( m_editor->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(contentChangedInEditor()) ); } } m_editor->widget()->disconnect(); @@ -4033,7 +4033,7 @@ void Basket::noteEdit(Note *note, bool justAdded, const TQPoint &clickedPoint) / } if (justAdded && isFiltering()) { - TQTimer::singleShot( 0, this, TQT_SLOT(showEditedNoteWhileFiltering()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(showEditedNoteWhileFiltering()) ); } doHoverEffects(note, Note::Content); // Be sure (in the case Edit was triggered by menu or Enter key...): better feedback! @@ -4053,24 +4053,24 @@ void Basket::noteEdit(Note *note, bool justAdded, const TQPoint &clickedPoint) / placeEditorAndEnsureVisible(); // placeEditor(); // FIXME: After? m_redirectEditActions = m_editor->lineEdit() || m_editor->textEdit(); if (m_redirectEditActions) { - connect( m_editor->widget(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChangedInEditor()) ); + connect( m_editor->widget(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChangedInEditor()) ); // In case there is NO text, "Select All" is disabled. But if the user press a key the there is now a text: // selection has not changed but "Select All" should be re-enabled: if (m_editor->textEdit()) { - connect( m_editor->textEdit(), TQT_SIGNAL(textChanged()), this, TQT_SLOT(selectionChangedInEditor()) ); - connect( m_editor->textEdit(), TQT_SIGNAL(textChanged()), this, TQT_SLOT(contentChangedInEditor()) ); + connect( m_editor->textEdit(), TQ_SIGNAL(textChanged()), this, TQ_SLOT(selectionChangedInEditor()) ); + connect( m_editor->textEdit(), TQ_SIGNAL(textChanged()), this, TQ_SLOT(contentChangedInEditor()) ); } else if (m_editor->lineEdit()) { - connect( m_editor->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(selectionChangedInEditor()) ); - connect( m_editor->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(contentChangedInEditor()) ); + connect( m_editor->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(selectionChangedInEditor()) ); + connect( m_editor->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(contentChangedInEditor()) ); } } m_editor->widget()->show(); //m_editor->widget()->raise(); m_editor->widget()->setFocus(); - connect( m_editor, TQT_SIGNAL(askValidation()), this, TQT_SLOT(closeEditorDelayed()) ); - connect( m_editor, TQT_SIGNAL(mouseEnteredEditorWidget()), this, TQT_SLOT(mouseEnteredEditorWidget()) ); + connect( m_editor, TQ_SIGNAL(askValidation()), this, TQ_SLOT(closeEditorDelayed()) ); + connect( m_editor, TQ_SIGNAL(mouseEnteredEditorWidget()), this, TQ_SLOT(mouseEnteredEditorWidget()) ); if (m_editor->textEdit()) { - connect( m_editor->textEdit(), TQT_SIGNAL(textChanged()), this, TQT_SLOT(placeEditorAndEnsureVisible()) ); + connect( m_editor->textEdit(), TQ_SIGNAL(textChanged()), this, TQ_SLOT(placeEditorAndEnsureVisible()) ); if (clickedPoint != TQPoint()) { TQPoint pos(clickedPoint.x() - note->x() - note->contentX() + m_editor->textEdit()->frameWidth() + 4 - m_editor->textEdit()->frameWidth(), clickedPoint.y() - note->y() - m_editor->textEdit()->frameWidth()); @@ -5106,7 +5106,7 @@ void Basket::focusInEvent(TQFocusEvent*) // Focus cannot be get with Tab when locked, but a click can focus the basket! if (isLocked()) { if (m_button) - TQTimer::singleShot( 0, m_button, TQT_SLOT(setFocus()) ); + TQTimer::singleShot( 0, m_button, TQ_SLOT(setFocus()) ); } else focusANote(); // hasFocus() is true at this stage, note will be focused } diff --git a/src/basket_part.cpp b/src/basket_part.cpp index 2059ab0..c42afe3 100644 --- a/src/basket_part.cpp +++ b/src/basket_part.cpp @@ -49,8 +49,8 @@ BasketPart::BasketPart( TQWidget *parentWidget, const char *, BasketStatusBar* bar = new BasketStatusBar(new KParts::StatusBarExtension(this)); // this should be your custom internal widget m_view = new BNPView(parentWidget, "BNPViewPart", this, actionCollection(), bar); - connect(m_view, TQT_SIGNAL(setWindowCaption(const TQString &)), this, TQT_SLOT(setCaption(const TQString &))); - connect(m_view, TQT_SIGNAL(showPart()), this, TQT_SIGNAL(showPart())); + connect(m_view, TQ_SIGNAL(setWindowCaption(const TQString &)), this, TQ_SLOT(setCaption(const TQString &))); + connect(m_view, TQ_SIGNAL(showPart()), this, TQ_SIGNAL(showPart())); m_view->setFocusPolicy(TQWidget::ClickFocus); // notify the part that this is our internal widget diff --git a/src/basketlistview.cpp b/src/basketlistview.cpp index 1cbe8c9..f3bf950 100644 --- a/src/basketlistview.cpp +++ b/src/basketlistview.cpp @@ -643,7 +643,7 @@ BasketTreeListView::BasketTreeListView(TQWidget *parent, const char *name) setWFlags(TQt::WStaticContents | WNoAutoErase); clearWFlags(TQt::WStaticContents | WNoAutoErase); //viewport()->clearWFlags(TQt::WStaticContents); - connect( &m_autoOpenTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoOpen()) ); + connect( &m_autoOpenTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(autoOpen()) ); new BasketTreeListView_ToolTip(this); } diff --git a/src/basketproperties.cpp b/src/basketproperties.cpp index f6f88bd..d2104ae 100644 --- a/src/basketproperties.cpp +++ b/src/basketproperties.cpp @@ -115,7 +115,7 @@ BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, TQWidget *parent) m_columnCount = new KIntNumInput(m_basket->columnsCount(), columnsWidget); m_columnCount->setRange(1, 20, /*step=*/1, /*slider=*/false); m_columnCount->setValue(m_basket->columnsCount()); - connect( m_columnCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(selectColumnsLayout()) ); + connect( m_columnCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(selectColumnsLayout()) ); dispoLayout->addWidget(radio); dispoLayout->addWidget(m_columnCount); m_disposition->insert(radio); @@ -149,7 +149,7 @@ BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, TQWidget *parent) shortcutLayout->addWidget(m_shortcut); shortcutLayout->addStretch(); shortcutLayout->addWidget(helpLabel); - connect( m_shortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), this, TQT_SLOT(capturedShortcut(const TDEShortcut&)) ); + connect( m_shortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), this, TQ_SLOT(capturedShortcut(const TDEShortcut&)) ); new TQRadioButton(i18n("S&how this basket"), m_shortcutRole); new TQRadioButton(i18n("Show this basket (&global shortcut)"), m_shortcutRole); new TQRadioButton(i18n("S&witch to this basket (global shortcut)"), m_shortcutRole); diff --git a/src/basketstatusbar.cpp b/src/basketstatusbar.cpp index d1ab751..f85954a 100644 --- a/src/basketstatusbar.cpp +++ b/src/basketstatusbar.cpp @@ -91,7 +91,7 @@ void BasketStatusBar::setupStatusBar() m_lockStatus->setMinimumSize(18, 18); m_lockStatus->setAlignment(TQt::AlignCenter); // addWidget( m_lockStatus, 0, true ); - connect( m_lockStatus, TQT_SIGNAL(clicked()), Global::bnpView, TQT_SLOT(lockBasket()) ); + connect( m_lockStatus, TQ_SIGNAL(clicked()), Global::bnpView, TQ_SLOT(lockBasket()) ); m_savedStatusPixmap = SmallIcon("document-save"); m_savedStatus = new TQLabel(parent); diff --git a/src/bnpview.cpp b/src/bnpview.cpp index 8f9f83a..43ba58e 100644 --- a/src/bnpview.cpp +++ b/src/bnpview.cpp @@ -100,7 +100,7 @@ BNPView::BNPView(TQWidget *parent, const char *name, KXMLGUIClient *aGUIClient, setupGlobalShortcuts(); initialize(); - TQTimer::singleShot(0, this, TQT_SLOT(lateInit())); + TQTimer::singleShot(0, this, TQ_SLOT(lateInit())); } BNPView::~BNPView() @@ -154,7 +154,7 @@ void BNPView::lateInit() /* System tray icon */ Global::systemTray = new SystemTray(Global::mainWindow()); - connect( Global::systemTray, TQT_SIGNAL(showPart()), this, TQT_SIGNAL(showPart()) ); + connect( Global::systemTray, TQ_SIGNAL(showPart()), this, TQ_SIGNAL(showPart()) ); if (Settings::useSystray()) Global::systemTray->show(); @@ -188,8 +188,8 @@ void BNPView::lateInit() m_tryHideTimer = new TQTimer(this); m_hideTimer = new TQTimer(this); - connect( m_tryHideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutTryHide()) ); - connect( m_hideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutHide()) ); + connect( m_tryHideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutTryHide()) ); + connect( m_hideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutHide()) ); // Preload every baskets for instant filtering: /*StopWatch::start(100); @@ -276,62 +276,62 @@ void BNPView::setupGlobalShortcuts() globalAccel->insert( "global_show_hide_main_window", i18n("Show/hide main window"), i18n("Allows you to show main Window if it is hidden, and to hide it if it is shown."), TQt::CTRL + TQt::ALT + TQt::SHIFT + TQt::Key_W, TQt::CTRL + TQt::ALT + TQt::SHIFT + TQt::Key_W, - basketMainWindow, TQT_SLOT(changeActive()), true, true ); + basketMainWindow, TQ_SLOT(changeActive()), true, true ); } globalAccel->insert( "global_paste", i18n("Paste clipboard contents in current basket"), i18n("Allows you to paste clipboard contents in the current basket without having to open the main window."), TQt::CTRL + TQt::ALT + TQt::SHIFT + TQt::Key_V, TQt::CTRL + TQt::ALT + TQt::SHIFT + TQt::Key_V, - Global::bnpView, TQT_SLOT(globalPasteInCurrentBasket()), true, true ); + Global::bnpView, TQ_SLOT(globalPasteInCurrentBasket()), true, true ); globalAccel->insert( "global_show_current_basket", i18n("Show current basket name"), i18n("Allows you to know basket is current without opening the main window."), "", "", - Global::bnpView, TQT_SLOT(showPassiveContentForced()), true, true ); + Global::bnpView, TQ_SLOT(showPassiveContentForced()), true, true ); globalAccel->insert( "global_paste_selection", i18n("Paste selection in current basket"), i18n("Allows you to paste clipboard selection in the current basket without having to open the main window."), TQt::CTRL + TQt::ALT + TQt::SHIFT + TQt::Key_S, TQt::CTRL + TQt::ALT + TQt::SHIFT + TQt::Key_S, - Global::bnpView, TQT_SLOT(pasteSelInCurrentBasket()), true, true ); + Global::bnpView, TQ_SLOT(pasteSelInCurrentBasket()), true, true ); globalAccel->insert( "global_new_basket", i18n("Create a new basket"), i18n("Allows you to create a new basket without having to open the main window (you then can use the other global shortcuts to add a note, paste clipboard or paste selection in this new basket)."), "", "", - Global::bnpView, TQT_SLOT(askNewBasket()), true, true ); + Global::bnpView, TQ_SLOT(askNewBasket()), true, true ); globalAccel->insert( "global_previous_basket", i18n("Go to previous basket"), i18n("Allows you to change current basket to the previous one without having to open the main window."), "", "", - Global::bnpView, TQT_SLOT(goToPreviousBasket()), true, true ); + Global::bnpView, TQ_SLOT(goToPreviousBasket()), true, true ); globalAccel->insert( "global_next_basket", i18n("Go to next basket"), i18n("Allows you to change current basket to the next one without having to open the main window."), "", "", - Global::bnpView, TQT_SLOT(goToNextBasket()), true, true ); + Global::bnpView, TQ_SLOT(goToNextBasket()), true, true ); // globalAccel->insert( "global_note_add_text", i18n("Insert plain text note"), // i18n("Add a plain text note to the current basket without having to open the main window."), // "", "", //TQt::CTRL+TQt::ALT+TQt::Key_T, TQt::CTRL+TQt::ALT+TQt::Key_T, -// Global::bnpView, TQT_SLOT(addNoteText()), true, true ); +// Global::bnpView, TQ_SLOT(addNoteText()), true, true ); globalAccel->insert( "global_note_add_html", i18n("Insert text note"), i18n("Add a text note to the current basket without having to open the main window."), TQt::CTRL + TQt::ALT + TQt::SHIFT + TQt::Key_T, TQt::CTRL + TQt::ALT + TQt::SHIFT + TQt::Key_T, //"", "", - Global::bnpView, TQT_SLOT(addNoteHtml()), true, true ); + Global::bnpView, TQ_SLOT(addNoteHtml()), true, true ); globalAccel->insert( "global_note_add_image", i18n("Insert image note"), i18n("Add an image note to the current basket without having to open the main window."), "", "", - Global::bnpView, TQT_SLOT(addNoteImage()), true, true ); + Global::bnpView, TQ_SLOT(addNoteImage()), true, true ); globalAccel->insert( "global_note_add_link", i18n("Insert link note"), i18n("Add a link note to the current basket without having to open the main window."), "", "", - Global::bnpView, TQT_SLOT(addNoteLink()), true, true ); + Global::bnpView, TQ_SLOT(addNoteLink()), true, true ); globalAccel->insert( "global_note_add_color", i18n("Insert color note"), i18n("Add a color note to the current basket without having to open the main window."), "", "", - Global::bnpView, TQT_SLOT(addNoteColor()), true, true ); + Global::bnpView, TQ_SLOT(addNoteColor()), true, true ); globalAccel->insert( "global_note_pick_color", i18n("Pick color from screen"), i18n("Add a color note picked from one pixel on screen to the current basket without " "having to open the main window."), "", "", - Global::bnpView, TQT_SLOT(slotColorFromScreenGlobal()), true, true ); + Global::bnpView, TQ_SLOT(slotColorFromScreenGlobal()), true, true ); globalAccel->insert( "global_note_grab_screenshot", i18n("Grab screen zone"), i18n("Grab a screen zone as an image in the current basket without " "having to open the main window."), "", "", - Global::bnpView, TQT_SLOT(grabScreenshotGlobal()), true, true ); + Global::bnpView, TQ_SLOT(grabScreenshotGlobal()), true, true ); globalAccel->readSettings(); globalAccel->updateConnections(); } @@ -369,21 +369,21 @@ void BNPView::initialize() setResizeMode(m_stack, TQSplitter::Stretch); /// Configure the List View Signals: - connect( m_tree, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotPressed(TQListViewItem*)) ); - connect( m_tree, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotPressed(TQListViewItem*)) ); - connect( m_tree, TQT_SIGNAL(pressed(TQListViewItem*)), this, TQT_SLOT(slotPressed(TQListViewItem*)) ); - connect( m_tree, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(needSave(TQListViewItem*)) ); - connect( m_tree, TQT_SIGNAL(collapsed(TQListViewItem*)), this, TQT_SLOT(needSave(TQListViewItem*)) ); - connect( m_tree, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); - connect( m_tree, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) ); - connect( m_tree, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotShowProperties(TQListViewItem*, const TQPoint&, int)) ); - - connect( m_tree, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SIGNAL(basketChanged()) ); - connect( m_tree, TQT_SIGNAL(collapsed(TQListViewItem*)), this, TQT_SIGNAL(basketChanged()) ); - connect( this, TQT_SIGNAL(basketNumberChanged(int)), this, TQT_SIGNAL(basketChanged()) ); - - connect( this, TQT_SIGNAL(basketNumberChanged(int)), this, TQT_SLOT(slotBasketNumberChanged(int)) ); - connect( this, TQT_SIGNAL(basketChanged()), this, TQT_SLOT(slotBasketChanged()) ); + connect( m_tree, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(slotPressed(TQListViewItem*)) ); + connect( m_tree, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotPressed(TQListViewItem*)) ); + connect( m_tree, TQ_SIGNAL(pressed(TQListViewItem*)), this, TQ_SLOT(slotPressed(TQListViewItem*)) ); + connect( m_tree, TQ_SIGNAL(expanded(TQListViewItem*)), this, TQ_SLOT(needSave(TQListViewItem*)) ); + connect( m_tree, TQ_SIGNAL(collapsed(TQListViewItem*)), this, TQ_SLOT(needSave(TQListViewItem*)) ); + connect( m_tree, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( m_tree, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) ); + connect( m_tree, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(slotShowProperties(TQListViewItem*, const TQPoint&, int)) ); + + connect( m_tree, TQ_SIGNAL(expanded(TQListViewItem*)), this, TQ_SIGNAL(basketChanged()) ); + connect( m_tree, TQ_SIGNAL(collapsed(TQListViewItem*)), this, TQ_SIGNAL(basketChanged()) ); + connect( this, TQ_SIGNAL(basketNumberChanged(int)), this, TQ_SIGNAL(basketChanged()) ); + + connect( this, TQ_SIGNAL(basketNumberChanged(int)), this, TQ_SLOT(slotBasketNumberChanged(int)) ); + connect( this, TQ_SIGNAL(basketChanged()), this, TQ_SLOT(slotBasketChanged()) ); /* LikeBack */ Global::likeBack = new LikeBack(LikeBack::AllButtons, /*showBarByDefault=*/false, Global::config(), Global::about()); @@ -412,91 +412,91 @@ void BNPView::initialize() void BNPView::setupActions() { m_actSaveAsArchive = new TDEAction( i18n("&Basket Archive..."), "baskets", 0, - this, TQT_SLOT(saveAsArchive()), actionCollection(), "basket_export_basket_archive" ); + this, TQ_SLOT(saveAsArchive()), actionCollection(), "basket_export_basket_archive" ); m_actOpenArchive = new TDEAction( i18n("&Basket Archive..."), "baskets", 0, - this, TQT_SLOT(openArchive()), actionCollection(), "basket_import_basket_archive" ); + this, TQ_SLOT(openArchive()), actionCollection(), "basket_import_basket_archive" ); m_actHideWindow = new TDEAction( i18n("&Hide Window"), "", TDEStdAccel::shortcut(TDEStdAccel::Close), - this, TQT_SLOT(hideOnEscape()), actionCollection(), "window_hide" ); + this, TQ_SLOT(hideOnEscape()), actionCollection(), "window_hide" ); m_actHideWindow->setEnabled(Settings::useSystray()); // Init here ! m_actExportToHtml = new TDEAction( i18n("&HTML Web Page..."), "text-html", 0, - this, TQT_SLOT(exportToHTML()), actionCollection(), "basket_export_html" ); + this, TQ_SLOT(exportToHTML()), actionCollection(), "basket_export_html" ); new TDEAction( i18n("K&Notes"), "knotes", 0, - this, TQT_SLOT(importKNotes()), actionCollection(), "basket_import_knotes" ); + this, TQ_SLOT(importKNotes()), actionCollection(), "basket_import_knotes" ); new TDEAction( i18n("K&Jots"), "kjots", 0, - this, TQT_SLOT(importKJots()), actionCollection(), "basket_import_kjots" ); + this, TQ_SLOT(importKJots()), actionCollection(), "basket_import_kjots" ); new TDEAction( i18n("&KnowIt..."), "knowit", 0, - this, TQT_SLOT(importKnowIt()), actionCollection(), "basket_import_knowit" ); + this, TQ_SLOT(importKnowIt()), actionCollection(), "basket_import_knowit" ); new TDEAction( i18n("Tux&Cards..."), "tuxcards", 0, - this, TQT_SLOT(importTuxCards()), actionCollection(), "basket_import_tuxcards" ); + this, TQ_SLOT(importTuxCards()), actionCollection(), "basket_import_tuxcards" ); new TDEAction( i18n("&Sticky Notes"), "gnome", 0, - this, TQT_SLOT(importStickyNotes()), actionCollection(), "basket_import_sticky_notes" ); + this, TQ_SLOT(importStickyNotes()), actionCollection(), "basket_import_sticky_notes" ); new TDEAction( i18n("&Tomboy"), "tintin", 0, - this, TQT_SLOT(importTomboy()), actionCollection(), "basket_import_tomboy" ); + this, TQ_SLOT(importTomboy()), actionCollection(), "basket_import_tomboy" ); new TDEAction( i18n("Text &File..."), "text-plain", 0, - this, TQT_SLOT(importTextFile()), actionCollection(), "basket_import_text_file" ); + this, TQ_SLOT(importTextFile()), actionCollection(), "basket_import_text_file" ); new TDEAction( i18n("&Backup && Restore..."), "", 0, - this, TQT_SLOT(backupRestore()), actionCollection(), "basket_backup_restore" ); + this, TQ_SLOT(backupRestore()), actionCollection(), "basket_backup_restore" ); /** Note : ****************************************************************/ m_actDelNote = new TDEAction( i18n("D&elete"), "edit-delete", "Delete", - this, TQT_SLOT(delNote()), actionCollection(), "edit_delete" ); - m_actCutNote = KStdAction::cut( this, TQT_SLOT(cutNote()), actionCollection() ); - m_actCopyNote = KStdAction::copy( this, TQT_SLOT(copyNote()), actionCollection() ); + this, TQ_SLOT(delNote()), actionCollection(), "edit_delete" ); + m_actCutNote = KStdAction::cut( this, TQ_SLOT(cutNote()), actionCollection() ); + m_actCopyNote = KStdAction::copy( this, TQ_SLOT(copyNote()), actionCollection() ); - m_actSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection() ); + m_actSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection() ); m_actSelectAll->setStatusText( i18n( "Selects all notes" ) ); - m_actUnselectAll = new TDEAction( i18n( "U&nselect All" ), "", this, TQT_SLOT( slotUnselectAll() ), + m_actUnselectAll = new TDEAction( i18n( "U&nselect All" ), "", this, TQ_SLOT( slotUnselectAll() ), actionCollection(), "edit_unselect_all" ); m_actUnselectAll->setStatusText( i18n( "Unselects all selected notes" ) ); m_actInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, - this, TQT_SLOT( slotInvertSelection() ), + this, TQ_SLOT( slotInvertSelection() ), actionCollection(), "edit_invert_selection" ); m_actInvertSelection->setStatusText( i18n( "Inverts the current selection of notes" ) ); m_actEditNote = new TDEAction( i18n("Verb; not Menu", "&Edit..."), "edit", "Return", - this, TQT_SLOT(editNote()), actionCollection(), "note_edit" ); + this, TQ_SLOT(editNote()), actionCollection(), "note_edit" ); - m_actOpenNote = KStdAction::open( this, TQT_SLOT(openNote()), actionCollection(), "note_open" ); + m_actOpenNote = KStdAction::open( this, TQ_SLOT(openNote()), actionCollection(), "note_open" ); m_actOpenNote->setIcon("window-new"); m_actOpenNote->setText(i18n("&Open")); m_actOpenNote->setShortcut("F9"); m_actOpenNoteWith = new TDEAction( i18n("Open &With..."), "", "Shift+F9", - this, TQT_SLOT(openNoteWith()), actionCollection(), "note_open_with" ); - m_actSaveNoteAs = KStdAction::saveAs( this, TQT_SLOT(saveNoteAs()), actionCollection(), "note_save_to_file" ); + this, TQ_SLOT(openNoteWith()), actionCollection(), "note_open_with" ); + m_actSaveNoteAs = KStdAction::saveAs( this, TQ_SLOT(saveNoteAs()), actionCollection(), "note_save_to_file" ); m_actSaveNoteAs->setIcon(""); m_actSaveNoteAs->setText(i18n("&Save to File...")); m_actSaveNoteAs->setShortcut("F10"); m_actGroup = new TDEAction( i18n("&Group"), "attach", "Ctrl+G", - this, TQT_SLOT(noteGroup()), actionCollection(), "note_group" ); + this, TQ_SLOT(noteGroup()), actionCollection(), "note_group" ); m_actUngroup = new TDEAction( i18n("U&ngroup"), "", "Ctrl+Shift+G", - this, TQT_SLOT(noteUngroup()), actionCollection(), "note_ungroup" ); + this, TQ_SLOT(noteUngroup()), actionCollection(), "note_ungroup" ); m_actMoveOnTop = new TDEAction( i18n("Move on &Top"), "2uparrow", "Ctrl+Shift+Home", - this, TQT_SLOT(moveOnTop()), actionCollection(), "note_move_top" ); + this, TQ_SLOT(moveOnTop()), actionCollection(), "note_move_top" ); m_actMoveNoteUp = new TDEAction( i18n("Move &Up"), "1uparrow", "Ctrl+Shift+Up", - this, TQT_SLOT(moveNoteUp()), actionCollection(), "note_move_up" ); + this, TQ_SLOT(moveNoteUp()), actionCollection(), "note_move_up" ); m_actMoveNoteDown = new TDEAction( i18n("Move &Down"), "1downarrow", "Ctrl+Shift+Down", - this, TQT_SLOT(moveNoteDown()), actionCollection(), "note_move_down" ); + this, TQ_SLOT(moveNoteDown()), actionCollection(), "note_move_down" ); m_actMoveOnBottom = new TDEAction( i18n("Move on &Bottom"), "2downarrow", "Ctrl+Shift+End", - this, TQT_SLOT(moveOnBottom()), actionCollection(), "note_move_bottom" ); + this, TQ_SLOT(moveOnBottom()), actionCollection(), "note_move_bottom" ); #if KDE_IS_VERSION( 3, 1, 90 ) // KDE 3.2.x - m_actPaste = KStdAction::pasteText( this, TQT_SLOT(pasteInCurrentBasket()), actionCollection() ); + m_actPaste = KStdAction::pasteText( this, TQ_SLOT(pasteInCurrentBasket()), actionCollection() ); #else - m_actPaste = KStdAction::paste( this, TQT_SLOT(pasteInCurrentBasket()), actionCollection() ); + m_actPaste = KStdAction::paste( this, TQ_SLOT(pasteInCurrentBasket()), actionCollection() ); #endif /** Insert : **************************************************************/ TQSignalMapper *insertEmptyMapper = new TQSignalMapper(this); TQSignalMapper *insertWizardMapper = new TQSignalMapper(this); - connect( insertEmptyMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(insertEmpty(int)) ); - connect( insertWizardMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(insertWizard(int)) ); + connect( insertEmptyMapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(insertEmpty(int)) ); + connect( insertWizardMapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(insertWizard(int)) ); // m_actInsertText = new TDEAction( i18n("Plai&n Text"), "text", "Ctrl+T", actionCollection(), "insert_text" ); m_actInsertHtml = new TDEAction( i18n("&Text"), "text-html", "Insert", actionCollection(), "insert_html" ); @@ -509,12 +509,12 @@ void BNPView::setupActions() m_actImportIcon = new TDEAction( i18n("Im&port Icon..."), "icons", "", actionCollection(), "insert_icon" ); m_actLoadFile = new TDEAction( i18n("Load From &File..."), "fileimport", "", actionCollection(), "insert_from_file" ); -// connect( m_actInsertText, TQT_SIGNAL(activated()), insertEmptyMapper, TQT_SLOT(map()) ); - connect( m_actInsertHtml, TQT_SIGNAL(activated()), insertEmptyMapper, TQT_SLOT(map()) ); - connect( m_actInsertImage, TQT_SIGNAL(activated()), insertEmptyMapper, TQT_SLOT(map()) ); - connect( m_actInsertLink, TQT_SIGNAL(activated()), insertEmptyMapper, TQT_SLOT(map()) ); - connect( m_actInsertColor, TQT_SIGNAL(activated()), insertEmptyMapper, TQT_SLOT(map()) ); - connect( m_actInsertLauncher, TQT_SIGNAL(activated()), insertEmptyMapper, TQT_SLOT(map()) ); +// connect( m_actInsertText, TQ_SIGNAL(activated()), insertEmptyMapper, TQ_SLOT(map()) ); + connect( m_actInsertHtml, TQ_SIGNAL(activated()), insertEmptyMapper, TQ_SLOT(map()) ); + connect( m_actInsertImage, TQ_SIGNAL(activated()), insertEmptyMapper, TQ_SLOT(map()) ); + connect( m_actInsertLink, TQ_SIGNAL(activated()), insertEmptyMapper, TQ_SLOT(map()) ); + connect( m_actInsertColor, TQ_SIGNAL(activated()), insertEmptyMapper, TQ_SLOT(map()) ); + connect( m_actInsertLauncher, TQ_SIGNAL(activated()), insertEmptyMapper, TQ_SLOT(map()) ); // insertEmptyMapper->setMapping(m_actInsertText, NoteType::Text ); insertEmptyMapper->setMapping(m_actInsertHtml, NoteType::Html ); insertEmptyMapper->setMapping(m_actInsertImage, NoteType::Image ); @@ -522,23 +522,23 @@ void BNPView::setupActions() insertEmptyMapper->setMapping(m_actInsertColor, NoteType::Color ); insertEmptyMapper->setMapping(m_actInsertLauncher, NoteType::Launcher); - connect( m_actImportKMenu, TQT_SIGNAL(activated()), insertWizardMapper, TQT_SLOT(map()) ); - connect( m_actImportIcon, TQT_SIGNAL(activated()), insertWizardMapper, TQT_SLOT(map()) ); - connect( m_actLoadFile, TQT_SIGNAL(activated()), insertWizardMapper, TQT_SLOT(map()) ); + connect( m_actImportKMenu, TQ_SIGNAL(activated()), insertWizardMapper, TQ_SLOT(map()) ); + connect( m_actImportIcon, TQ_SIGNAL(activated()), insertWizardMapper, TQ_SLOT(map()) ); + connect( m_actLoadFile, TQ_SIGNAL(activated()), insertWizardMapper, TQ_SLOT(map()) ); insertWizardMapper->setMapping(m_actImportKMenu, 1 ); insertWizardMapper->setMapping(m_actImportIcon, 2 ); insertWizardMapper->setMapping(m_actLoadFile, 3 ); m_colorPicker = new DesktopColorPicker(); m_actColorPicker = new TDEAction( i18n("C&olor from Screen"), "kcolorchooser", "", - this, TQT_SLOT(slotColorFromScreen()), actionCollection(), "insert_screen_color" ); - connect( m_colorPicker, TQT_SIGNAL(pickedColor(const TQColor&)), this, TQT_SLOT(colorPicked(const TQColor&)) ); - connect( m_colorPicker, TQT_SIGNAL(canceledPick()), this, TQT_SLOT(colorPickingCanceled()) ); + this, TQ_SLOT(slotColorFromScreen()), actionCollection(), "insert_screen_color" ); + connect( m_colorPicker, TQ_SIGNAL(pickedColor(const TQColor&)), this, TQ_SLOT(colorPicked(const TQColor&)) ); + connect( m_colorPicker, TQ_SIGNAL(canceledPick()), this, TQ_SLOT(colorPickingCanceled()) ); m_actGrabScreenshot = new TDEAction( i18n("Grab Screen &Zone"), "ksnapshot", "", - this, TQT_SLOT(grabScreenshot()), actionCollection(), "insert_screen_capture" ); - //connect( m_actGrabScreenshot, TQT_SIGNAL(regionGrabbed(const TQPixmap&)), this, TQT_SLOT(screenshotGrabbed(const TQPixmap&)) ); - //connect( m_colorPicker, TQT_SIGNAL(canceledPick()), this, TQT_SLOT(colorPickingCanceled()) ); + this, TQ_SLOT(grabScreenshot()), actionCollection(), "insert_screen_capture" ); + //connect( m_actGrabScreenshot, TQ_SIGNAL(regionGrabbed(const TQPixmap&)), this, TQ_SLOT(screenshotGrabbed(const TQPixmap&)) ); + //connect( m_colorPicker, TQ_SIGNAL(canceledPick()), this, TQ_SLOT(colorPickingCanceled()) ); // m_insertActions.append( m_actInsertText ); m_insertActions.append( m_actInsertHtml ); @@ -566,69 +566,69 @@ void BNPView::setupActions() // Use the "basket" incon in Kontact so it is consistent with the Kontact "New..." icon actNewBasket = new TDEAction( i18n("&New Basket..."), (runInsideKontact ? "basket" : "document-new"), TDEStdAccel::shortcut(TDEStdAccel::New), - this, TQT_SLOT(askNewBasket()), actionCollection(), "basket_new" ); + this, TQ_SLOT(askNewBasket()), actionCollection(), "basket_new" ); actNewSubBasket = new TDEAction( i18n("New &Sub-Basket..."), "", "Ctrl+Shift+N", - this, TQT_SLOT(askNewSubBasket()), actionCollection(), "basket_new_sub" ); + this, TQ_SLOT(askNewSubBasket()), actionCollection(), "basket_new_sub" ); actNewSiblingBasket = new TDEAction( i18n("New Si&bling Basket..."), "", "", - this, TQT_SLOT(askNewSiblingBasket()), actionCollection(), "basket_new_sibling" ); + this, TQ_SLOT(askNewSiblingBasket()), actionCollection(), "basket_new_sibling" ); TDEActionMenu *newBasketMenu = new TDEActionMenu(i18n("&New"), "document-new", actionCollection(), "basket_new_menu"); newBasketMenu->insert(actNewBasket); newBasketMenu->insert(actNewSubBasket); newBasketMenu->insert(actNewSiblingBasket); - connect( newBasketMenu, TQT_SIGNAL(activated()), this, TQT_SLOT(askNewBasket()) ); + connect( newBasketMenu, TQ_SIGNAL(activated()), this, TQ_SLOT(askNewBasket()) ); m_actPropBasket = new TDEAction( i18n("&Properties..."), "misc", "F2", - this, TQT_SLOT(propBasket()), actionCollection(), "basket_properties" ); + this, TQ_SLOT(propBasket()), actionCollection(), "basket_properties" ); m_actDelBasket = new TDEAction( i18n("Remove Basket", "&Remove"), "", 0, - this, TQT_SLOT(delBasket()), actionCollection(), "basket_remove" ); + this, TQ_SLOT(delBasket()), actionCollection(), "basket_remove" ); #ifdef HAVE_LIBGPGME m_actPassBasket = new TDEAction( i18n("Password protection", "Pass&word..."), "", 0, - this, TQT_SLOT(password()), actionCollection(), "basket_password" ); + this, TQ_SLOT(password()), actionCollection(), "basket_password" ); m_actLockBasket = new TDEAction( i18n("Lock Basket", "&Lock"), "", "Ctrl+L", - this, TQT_SLOT(lockBasket()), actionCollection(), "basket_lock" ); + this, TQ_SLOT(lockBasket()), actionCollection(), "basket_lock" ); #endif /** Edit : ****************************************************************/ - //m_actUndo = KStdAction::undo( this, TQT_SLOT(undo()), actionCollection() ); + //m_actUndo = KStdAction::undo( this, TQ_SLOT(undo()), actionCollection() ); //m_actUndo->setEnabled(false); // Not yet implemented ! - //m_actRedo = KStdAction::redo( this, TQT_SLOT(redo()), actionCollection() ); + //m_actRedo = KStdAction::redo( this, TQ_SLOT(redo()), actionCollection() ); //m_actRedo->setEnabled(false); // Not yet implemented ! m_actShowFilter = new TDEToggleAction( i18n("&Filter"), "filter", TDEStdAccel::shortcut(TDEStdAccel::Find), actionCollection(), "edit_filter" ); - connect( m_actShowFilter, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showHideFilterBar(bool)) ); + connect( m_actShowFilter, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showHideFilterBar(bool)) ); m_actFilterAllBaskets = new TDEToggleAction( i18n("Filter all &Baskets"), "edit-find", "Ctrl+Shift+F", actionCollection(), "edit_filter_all_baskets" ); - connect( m_actFilterAllBaskets, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleFilterAllBaskets(bool)) ); + connect( m_actFilterAllBaskets, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(toggleFilterAllBaskets(bool)) ); m_actResetFilter = new TDEAction( i18n( "&Reset Filter" ), "locationbar_erase", "Ctrl+R", - this, TQT_SLOT( slotResetFilter() ), actionCollection(), "edit_filter_reset" ); + this, TQ_SLOT( slotResetFilter() ), actionCollection(), "edit_filter_reset" ); /** Go : ******************************************************************/ m_actPreviousBasket = new TDEAction( i18n( "&Previous Basket" ), "go-up", "Alt+Up", - this, TQT_SLOT(goToPreviousBasket()), actionCollection(), "go_basket_previous" ); + this, TQ_SLOT(goToPreviousBasket()), actionCollection(), "go_basket_previous" ); m_actNextBasket = new TDEAction( i18n( "&Next Basket" ), "go-down", "Alt+Down", - this, TQT_SLOT(goToNextBasket()), actionCollection(), "go_basket_next" ); + this, TQ_SLOT(goToNextBasket()), actionCollection(), "go_basket_next" ); m_actFoldBasket = new TDEAction( i18n( "&Fold Basket" ), "back", "Alt+Left", - this, TQT_SLOT(foldBasket()), actionCollection(), "go_basket_fold" ); + this, TQ_SLOT(foldBasket()), actionCollection(), "go_basket_fold" ); m_actExpandBasket = new TDEAction( i18n( "&Expand Basket" ), "forward", "Alt+Right", - this, TQT_SLOT(expandBasket()), actionCollection(), "go_basket_expand" ); + this, TQ_SLOT(expandBasket()), actionCollection(), "go_basket_expand" ); // FOR_BETA_PURPOSE: // m_convertTexts = new TDEAction( i18n("Convert text notes to rich text notes"), "compfile", "", -// this, TQT_SLOT(convertTexts()), actionCollection(), "beta_convert_texts" ); +// this, TQ_SLOT(convertTexts()), actionCollection(), "beta_convert_texts" ); InlineEditors::instance()->initToolBars(actionCollection()); - actConfigGlobalShortcuts = KStdAction::keyBindings(this, TQT_SLOT(showGlobalShortcutsSettingsDialog()), + actConfigGlobalShortcuts = KStdAction::keyBindings(this, TQ_SLOT(showGlobalShortcutsSettingsDialog()), actionCollection(), "options_configure_global_keybinding"); actConfigGlobalShortcuts->setText(i18n("Configure &Global Shortcuts...")); /** Help : ****************************************************************/ - new TDEAction( i18n("&Welcome Baskets"), "", "", this, TQT_SLOT(addWelcomeBaskets()), actionCollection(), "help_welcome_baskets" ); + new TDEAction( i18n("&Welcome Baskets"), "", "", this, TQ_SLOT(addWelcomeBaskets()), actionCollection(), "help_welcome_baskets" ); } TQListViewItem* BNPView::firstListViewItem() @@ -670,7 +670,7 @@ void BNPView::slotContextMenu(TDEListView */*listView*/, TQListViewItem *item, c } TQPopupMenu *menu = popupMenu(menuName); - connect( menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(aboutToHideNewBasketPopup()) ); + connect( menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(aboutToHideNewBasketPopup()) ); menu->exec(pos); } @@ -796,11 +796,11 @@ Basket* BNPView::loadBasket(const TQString &folderName) DecoratedBasket *decoBasket = new DecoratedBasket(m_stack, folderName); Basket *basket = decoBasket->basket(); m_stack->addWidget(decoBasket); - connect( basket, TQT_SIGNAL(countsChanged(Basket*)), this, TQT_SLOT(countsChanged(Basket*)) ); + connect( basket, TQ_SIGNAL(countsChanged(Basket*)), this, TQ_SLOT(countsChanged(Basket*)) ); // Important: Create listViewItem and connect signal BEFORE loadProperties(), so we get the listViewItem updated without extra work: - connect( basket, TQT_SIGNAL(propertiesChanged(Basket*)), this, TQT_SLOT(updateBasketListViewItem(Basket*)) ); + connect( basket, TQ_SIGNAL(propertiesChanged(Basket*)), this, TQ_SLOT(updateBasketListViewItem(Basket*)) ); - connect( basket->decoration()->filterBar(), TQT_SIGNAL(newFilter(const FilterData&)), this, TQT_SLOT(newFilterFromFilterBar()) ); + connect( basket->decoration()->filterBar(), TQ_SIGNAL(newFilter(const FilterData&)), this, TQ_SLOT(newFilterFromFilterBar()) ); return basket; } @@ -1078,7 +1078,7 @@ void BNPView::newFilter() void BNPView::newFilterFromFilterBar() { if (isFilteringAllBaskets()) - TQTimer::singleShot(0, this, TQT_SLOT(newFilter())); // Keep time for the TQLineEdit to display the filtered character and refresh correctly! + TQTimer::singleShot(0, this, TQ_SLOT(newFilter())); // Keep time for the TQLineEdit to display the filtered character and refresh correctly! } bool BNPView::isFilteringAllBaskets() @@ -1270,7 +1270,7 @@ void BNPView::needSave(TQListViewItem*) { if (!m_loading) // A basket has been collapsed/expanded or a new one is select: this is not urgent: - TQTimer::singleShot(500/*ms*/, this, TQT_SLOT(save())); + TQTimer::singleShot(500/*ms*/, this, TQ_SLOT(save())); } void BNPView::slotPressed(TQListViewItem *item, const TQPoint &/*pos*/, int /*column*/) @@ -1431,7 +1431,7 @@ void BNPView::updateNotesActions() } } else if (m_type != Color) { popupMenu->insertSeparator(); - popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save a copy as..."), this, TQT_SLOT(slotSaveAs()), 0, 10 ); + popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save a copy as..."), this, TQ_SLOT(slotSaveAs()), 0, 10 ); }*/ } @@ -1453,7 +1453,7 @@ void BNPView::slotColorFromScreen(bool global) /* m_gettingColorFromScreen = true; kapp->processEvents(); - TQTimer::singleShot( 100, this, TQT_SLOT(grabColorFromScreen()) );*/ + TQTimer::singleShot( 100, this, TQ_SLOT(grabColorFromScreen()) );*/ } void BNPView::slotColorFromScreenGlobal() @@ -1612,7 +1612,7 @@ void BNPView::grabScreenshot(bool global) currentBasket()->saveInsertionData(); m_regionGrabber = new RegionGrabber(delay); - connect( m_regionGrabber, TQT_SIGNAL(regionGrabbed(const TQPixmap&)), this, TQT_SLOT(screenshotGrabbed(const TQPixmap&)) ); + connect( m_regionGrabber, TQ_SIGNAL(regionGrabbed(const TQPixmap&)), this, TQ_SLOT(screenshotGrabbed(const TQPixmap&)) ); } void BNPView::grabScreenshotGlobal() @@ -1939,7 +1939,7 @@ void BNPView::showPassiveDropped(const TQString &title) // TODO: Keep basket, so that we show the message only if something was added to a NOT visible basket m_passiveDroppedTitle = title; m_passiveDroppedSelection = currentBasket()->selectedNotes(); - TQTimer::singleShot( c_delayTooltipTime, this, TQT_SLOT(showPassiveDroppedDelayed()) ); + TQTimer::singleShot( c_delayTooltipTime, this, TQ_SLOT(showPassiveDroppedDelayed()) ); // DELAY IT BELOW: } else showPassiveImpossible(i18n("No note was added.")); @@ -2023,7 +2023,7 @@ void BNPView::addNoteColor() { showMainWindow(); currentBasket()->insertEmptyNot void BNPView::aboutToHideNewBasketPopup() { - TQTimer::singleShot(0, this, TQT_SLOT(cancelNewBasketPopup())); + TQTimer::singleShot(0, this, TQ_SLOT(cancelNewBasketPopup())); } void BNPView::cancelNewBasketPopup() @@ -2277,7 +2277,7 @@ void BNPView::populateTagsMenu() populateTagsMenu(*menu, referenceNote); m_lastOpenedTagsMenu = menu; -// connect( menu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(disconnectTagsMenu()) ); +// connect( menu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(disconnectTagsMenu()) ); } void BNPView::populateTagsMenu(TDEPopupMenu &menu, Note *referenceNote) @@ -2325,15 +2325,15 @@ void BNPView::populateTagsMenu(TDEPopupMenu &menu, Note *referenceNote) if (!currentBasket()->selectedNotesHaveTags()) menu.setItemEnabled(2, false); - connect( &menu, TQT_SIGNAL(activated(int)), currentBasket(), TQT_SLOT(toggledTagInMenu(int)) ); - connect( &menu, TQT_SIGNAL(aboutToHide()), currentBasket(), TQT_SLOT(unlockHovering()) ); - connect( &menu, TQT_SIGNAL(aboutToHide()), currentBasket(), TQT_SLOT(disableNextClick()) ); + connect( &menu, TQ_SIGNAL(activated(int)), currentBasket(), TQ_SLOT(toggledTagInMenu(int)) ); + connect( &menu, TQ_SIGNAL(aboutToHide()), currentBasket(), TQ_SLOT(unlockHovering()) ); + connect( &menu, TQ_SIGNAL(aboutToHide()), currentBasket(), TQ_SLOT(disableNextClick()) ); } void BNPView::connectTagsMenu() { - connect( popupMenu("tags"), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(populateTagsMenu()) ); - connect( popupMenu("tags"), TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(disconnectTagsMenu()) ); + connect( popupMenu("tags"), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(populateTagsMenu()) ); + connect( popupMenu("tags"), TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(disconnectTagsMenu()) ); } /* @@ -2348,7 +2348,7 @@ void BNPView::connectTagsMenu() void BNPView::showEvent(TQShowEvent*) { if (isPart()) - TQTimer::singleShot( 0, this, TQT_SLOT(connectTagsMenu()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(connectTagsMenu()) ); if (m_firstShow) { m_firstShow = false; @@ -2362,8 +2362,8 @@ void BNPView::showEvent(TQShowEvent*) void BNPView::hideEvent(TQHideEvent*) { if (isPart()) { - disconnect( popupMenu("tags"), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(populateTagsMenu()) ); - disconnect( popupMenu("tags"), TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(disconnectTagsMenu()) ); + disconnect( popupMenu("tags"), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(populateTagsMenu()) ); + disconnect( popupMenu("tags"), TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(disconnectTagsMenu()) ); } if (isPart()) @@ -2372,14 +2372,14 @@ void BNPView::hideEvent(TQHideEvent*) void BNPView::disconnectTagsMenu() { - TQTimer::singleShot( 0, this, TQT_SLOT(disconnectTagsMenuDelayed()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(disconnectTagsMenuDelayed()) ); } void BNPView::disconnectTagsMenuDelayed() { - disconnect( m_lastOpenedTagsMenu, TQT_SIGNAL(activated(int)), currentBasket(), TQT_SLOT(toggledTagInMenu(int)) ); - disconnect( m_lastOpenedTagsMenu, TQT_SIGNAL(aboutToHide()), currentBasket(), TQT_SLOT(unlockHovering()) ); - disconnect( m_lastOpenedTagsMenu, TQT_SIGNAL(aboutToHide()), currentBasket(), TQT_SLOT(disableNextClick()) ); + disconnect( m_lastOpenedTagsMenu, TQ_SIGNAL(activated(int)), currentBasket(), TQ_SLOT(toggledTagInMenu(int)) ); + disconnect( m_lastOpenedTagsMenu, TQ_SIGNAL(aboutToHide()), currentBasket(), TQ_SLOT(unlockHovering()) ); + disconnect( m_lastOpenedTagsMenu, TQ_SIGNAL(aboutToHide()), currentBasket(), TQ_SLOT(disableNextClick()) ); } void BNPView::showGlobalShortcutsSettingsDialog() diff --git a/src/colorpicker.cpp b/src/colorpicker.cpp index 82b2076..57e34de 100644 --- a/src/colorpicker.cpp +++ b/src/colorpicker.cpp @@ -49,7 +49,7 @@ void DesktopColorPicker::pickColor() { m_gettingColorFromScreen = true; // Global::mainContainer->setActive(false); - TQTimer::singleShot( 50, this, TQT_SLOT(slotDelayedPick()) ); + TQTimer::singleShot( 50, this, TQ_SLOT(slotDelayedPick()) ); } /* When firered from basket context menu, and not from menu, grabMouse doesn't work! diff --git a/src/filter.cpp b/src/filter.cpp index c79e67d..226520a 100644 --- a/src/filter.cpp +++ b/src/filter.cpp @@ -61,7 +61,7 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) m_resetButton = new TQToolButton(this); m_resetButton->setIconSet(resetIconSet); - m_resetButton->setTextLabel(i18n("Reset Filter"));//, /*groupText=*/"", this, TQT_SLOT(reset()), 0); + m_resetButton->setTextLabel(i18n("Reset Filter"));//, /*groupText=*/"", this, TQ_SLOT(reset()), 0); m_resetButton->setAutoRaise(true); //new TDEToolBarButton("locationbar_erase", /*id=*/1230, this, /*name=*/0, i18n("Reset Filter")); m_lineEdit = new FocusedLineEdit(this); @@ -70,7 +70,7 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) TQLabel *label2 = new TQLabel(m_tagsBox, i18n("T&ag: "), this); m_inAllBasketsButton = new TQToolButton(this); m_inAllBasketsButton->setIconSet(inAllIconSet); - m_inAllBasketsButton->setTextLabel(i18n("Filter all Baskets"));//, /*groupText=*/"", this, TQT_SLOT(inAllBaskets()), 0); + m_inAllBasketsButton->setTextLabel(i18n("Filter all Baskets"));//, /*groupText=*/"", this, TQ_SLOT(inAllBaskets()), 0); m_inAllBasketsButton->setAutoRaise(true); // Configure the Reset button: @@ -100,18 +100,18 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) m_data = new FilterData(); // TODO: Not a pointer! and return a const & !! -// connect( &m_blinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkBar()) ); - connect( m_resetButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reset()) ); - connect( m_lineEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&)) ); - connect( m_tagsBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(tagChanged(int)) ); +// connect( &m_blinkTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(blinkBar()) ); + connect( m_resetButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reset()) ); + connect( m_lineEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(textChanged(const TQString&)) ); + connect( m_tagsBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(tagChanged(int)) ); -// connect( m_inAllBasketsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(inAllBaskets()) ); - connect( m_inAllBasketsButton, TQT_SIGNAL(toggled(bool)), Global::bnpView, TQT_SLOT(toggleFilterAllBaskets(bool)) ); +// connect( m_inAllBasketsButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(inAllBaskets()) ); + connect( m_inAllBasketsButton, TQ_SIGNAL(toggled(bool)), Global::bnpView, TQ_SLOT(toggleFilterAllBaskets(bool)) ); - connect( m_lineEdit, TQT_SIGNAL(escapePressed()), this, TQT_SIGNAL(escapePressed()) ); - connect( m_lineEdit, TQT_SIGNAL(returnPressed()), this, TQT_SIGNAL(returnPressed()) ); - connect( m_tagsBox, TQT_SIGNAL(escapePressed()), this, TQT_SIGNAL(escapePressed()) ); - connect( m_tagsBox, TQT_SIGNAL(returnPressed2()), this, TQT_SIGNAL(returnPressed()) ); + connect( m_lineEdit, TQ_SIGNAL(escapePressed()), this, TQ_SIGNAL(escapePressed()) ); + connect( m_lineEdit, TQ_SIGNAL(returnPressed()), this, TQ_SIGNAL(returnPressed()) ); + connect( m_tagsBox, TQ_SIGNAL(escapePressed()), this, TQ_SIGNAL(escapePressed()) ); + connect( m_tagsBox, TQ_SIGNAL(returnPressed2()), this, TQ_SIGNAL(returnPressed()) ); } FilterBar::~FilterBar() diff --git a/src/formatimporter.cpp b/src/formatimporter.cpp index b87a350..90e8ba3 100644 --- a/src/formatimporter.cpp +++ b/src/formatimporter.cpp @@ -63,7 +63,7 @@ void FormatImporter::copyFolder(const TQString &folder, const TQString &newFolde { copyFinished = false; TDEIO::CopyJob *copyJob = TDEIO::copyAs(KURL(folder), KURL(newFolder), /*showProgressInfo=*/false); - connect( copyJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotCopyingDone(TDEIO::Job*)) ); + connect( copyJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotCopyingDone(TDEIO::Job*)) ); while (!copyFinished) kapp->processEvents(); } @@ -72,7 +72,7 @@ void FormatImporter::moveFolder(const TQString &folder, const TQString &newFolde { copyFinished = false; TDEIO::CopyJob *copyJob = TDEIO::moveAs(KURL(folder), KURL(newFolder), /*showProgressInfo=*/false); - connect( copyJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotCopyingDone(TDEIO::Job*)) ); + connect( copyJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotCopyingDone(TDEIO::Job*)) ); while (!copyFinished) kapp->processEvents(); } diff --git a/src/kiconcanvas.cpp b/src/kiconcanvas.cpp index f905864..98e582b 100644 --- a/src/kiconcanvas.cpp +++ b/src/kiconcanvas.cpp @@ -94,9 +94,9 @@ TDEIconCanvas::TDEIconCanvas(TQWidget *parent, const char *name) d = new TDEIconCanvasPrivate; mpLoader = TDEGlobal::iconLoader(); mpTimer = new TQTimer(this); - connect(mpTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotLoadFiles())); - connect(this, TQT_SIGNAL(currentChanged(TQIconViewItem *)), - TQT_SLOT(slotCurrentChanged(TQIconViewItem *))); + connect(mpTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotLoadFiles())); + connect(this, TQ_SIGNAL(currentChanged(TQIconViewItem *)), + TQ_SLOT(slotCurrentChanged(TQIconViewItem *))); setAcceptDrops(false); setShowToolTips(true); setStrictIconSize(false); diff --git a/src/kicondialog.cpp b/src/kicondialog.cpp index 4980a89..d2c5592 100644 --- a/src/kicondialog.cpp +++ b/src/kicondialog.cpp @@ -118,14 +118,14 @@ void TDEIconDialog::init() // Hack standard Gui item, as KDevDesigner won't let us d->ui->browseButton->setText(i18n("&Browse...")); - connect(d->ui->browseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowse())); - connect(d->ui->listBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotContext(int))); - connect(d->ui->iconCanvas, TQT_SIGNAL(executed(TQIconViewItem *)), TQT_SLOT(slotOk())); - connect(d->ui->iconCanvas, TQT_SIGNAL(returnPressed(TQIconViewItem *)), TQT_SLOT(slotOk())); - connect(d->ui->iconCanvas, TQT_SIGNAL(startLoading(int)), TQT_SLOT(slotStartLoading(int))); - connect(d->ui->iconCanvas, TQT_SIGNAL(progress(int)), TQT_SLOT(slotProgress(int))); - connect(d->ui->iconCanvas, TQT_SIGNAL(finished()), TQT_SLOT(slotFinished())); - connect(this, TQT_SIGNAL(hidden()), d->ui->iconCanvas, TQT_SLOT(stopLoading())); + connect(d->ui->browseButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotBrowse())); + connect(d->ui->listBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotContext(int))); + connect(d->ui->iconCanvas, TQ_SIGNAL(executed(TQIconViewItem *)), TQ_SLOT(slotOk())); + connect(d->ui->iconCanvas, TQ_SIGNAL(returnPressed(TQIconViewItem *)), TQ_SLOT(slotOk())); + connect(d->ui->iconCanvas, TQ_SIGNAL(startLoading(int)), TQ_SLOT(slotStartLoading(int))); + connect(d->ui->iconCanvas, TQ_SIGNAL(progress(int)), TQ_SLOT(slotProgress(int))); + connect(d->ui->iconCanvas, TQ_SIGNAL(finished()), TQ_SLOT(slotFinished())); + connect(this, TQ_SIGNAL(hidden()), d->ui->iconCanvas, TQ_SLOT(stopLoading())); // NOTE: this must be consistent with the IconType enum (see above) d->ui->listBox->insertItem(i18n("(All Icons)")); @@ -443,7 +443,7 @@ void TDEIconButton::init( TDEIconLoader *loader ) mpLoader = loader; mpDialog = 0L; - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotChangeIcon())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotChangeIcon())); } TDEIconButton::~TDEIconButton() @@ -498,7 +498,7 @@ void TDEIconButton::setIcon(const TQString& icon) if (!mpDialog) { mpDialog = new TDEIconDialog(mpLoader, this); - connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&))); + connect(mpDialog, TQ_SIGNAL(newIconName(const TQString&)), TQ_SLOT(newIconName(const TQString&))); } } @@ -512,7 +512,7 @@ void TDEIconButton::setCustomLocation(const TQString &custom) if (!mpDialog) { mpDialog = new TDEIconDialog(mpLoader, this); - connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&))); + connect(mpDialog, TQ_SIGNAL(newIconName(const TQString&)), TQ_SLOT(newIconName(const TQString&))); } mpDialog->setCustomLocation(custom); @@ -529,7 +529,7 @@ void TDEIconButton::slotChangeIcon() if (!mpDialog) { mpDialog = new TDEIconDialog(mpLoader, this); - connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&))); + connect(mpDialog, TQ_SIGNAL(newIconName(const TQString&)), TQ_SLOT(newIconName(const TQString&))); } mpDialog->setup( mGroup, mContext, d->m_bStrictIconSize, d->iconSize, mbUser, d->lockUser, d->lockCustom ); diff --git a/src/likeback.cpp b/src/likeback.cpp index b081031..b716b14 100644 --- a/src/likeback.cpp +++ b/src/likeback.cpp @@ -74,31 +74,31 @@ LikeBackBar::LikeBackBar(LikeBack *likeBack) m_likeButton->setIconSet(likeIconSet); m_likeButton->setTextLabel("<p>" + i18n("Send application developers a comment about something you like")); m_likeButton->setAutoRaise(true); - connect( m_likeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickedLike()) ); + connect( m_likeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickedLike()) ); layout->add(m_likeButton); m_dislikeButton = new TQToolButton(this, "likeback_dislike"); m_dislikeButton->setIconSet(dislikeIconSet); m_dislikeButton->setTextLabel("<p>" + i18n("Send application developers a comment about something you dislike")); m_dislikeButton->setAutoRaise(true); - connect( m_dislikeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickedDislike()) ); + connect( m_dislikeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickedDislike()) ); layout->add(m_dislikeButton); m_bugButton = new TQToolButton(this, "likeback_bug"); m_bugButton->setIconSet(bugIconSet); m_bugButton->setTextLabel("<p>" + i18n("Send application developers a comment about an improper behavior of the application")); m_bugButton->setAutoRaise(true); - connect( m_bugButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickedBug()) ); + connect( m_bugButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickedBug()) ); layout->add(m_bugButton); m_featureButton = new TQToolButton(this, "likeback_feature"); m_featureButton->setIconSet(featureIconSet); m_featureButton->setTextLabel("<p>" + i18n("Send application developers a comment about a new feature you desire")); m_featureButton->setAutoRaise(true); - connect( m_featureButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickedFeature()) ); + connect( m_featureButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickedFeature()) ); layout->add(m_featureButton); - connect( &m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoMove()) ); + connect( &m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(autoMove()) ); LikeBack::Button buttons = likeBack->buttons(); m_likeButton->setShown( buttons & LikeBack::Like ); @@ -244,7 +244,7 @@ LikeBack::LikeBack(Button buttons, bool showBarByDefault, TDEConfig *config, con // Show the bar if that's wanted by the developer or the user: if (d->showBar) - TQTimer::singleShot( 0, d->bar, TQT_SLOT(startTimer()) ); + TQTimer::singleShot( 0, d->bar, TQ_SLOT(startTimer()) ); #if 0 disableBar(); @@ -379,7 +379,7 @@ TDEAction* LikeBack::sendACommentAction(TDEActionCollection *parent) if (d->action == 0) d->action = new TDEAction( i18n("&Send a Comment to Developers"), /*icon=*/"mail-message-new", /*shortcut=*/"", - this, TQT_SLOT(execCommentDialog()), + this, TQ_SLOT(execCommentDialog()), parent, "likeback_send_a_comment" ); @@ -585,7 +585,7 @@ bool LikeBack::isDevelopmentVersion(const TQString &version) return; m_process = new TDEProcess(); *m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount"); - connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(fetchUserEmail()) ); + connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(fetchUserEmail()) ); if (!m_process->start()) { kdDebug() << "Couldn't start tdecmshell.." << endl; delete m_process; @@ -718,11 +718,11 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC m_showButtons = new TQCheckBox(i18n("Show comment buttons below &window titlebars"), page); m_showButtons->setChecked(m_likeBack->userWantsToShowBar()); pageLayout->addWidget(m_showButtons); - connect( m_showButtons, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changeButtonBarVisible()) ); + connect( m_showButtons, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changeButtonBarVisible()) ); setButtonOK(KGuiItem(i18n("&Send Comment"), "mail-send")); enableButtonOK(false); - connect( m_comment, TQT_SIGNAL(textChanged()), this, TQT_SLOT(commentChanged()) ); + connect( m_comment, TQ_SIGNAL(textChanged()), this, TQ_SLOT(commentChanged()) ); setButtonGuiItem(Default, KGuiItem(i18n("&Email Address..."), "mail_generic")); @@ -730,7 +730,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC TQAction *sendShortcut = new TQAction(this); sendShortcut->setAccel(TQString("Ctrl+Return")); - connect( sendShortcut, TQT_SIGNAL(activated()), actionButton(Ok), TQT_SLOT(animateClick()) ); + connect( sendShortcut, TQ_SIGNAL(activated()), actionButton(Ok), TQ_SLOT(animateClick()) ); setMainWidget(page); } @@ -820,7 +820,7 @@ void LikeBackDialog::send() std::cout << "http://" << m_likeBack->hostName().local8Bit() << ":" << m_likeBack->hostPort() << m_likeBack->remotePath().local8Bit() << std::endl; std::cout << data.local8Bit() << std::endl; - connect( http, TQT_SIGNAL(requestFinished(int, bool)), this, TQT_SLOT(requestFinished(int, bool)) ); + connect( http, TQ_SIGNAL(requestFinished(int, bool)), this, TQ_SLOT(requestFinished(int, bool)) ); TQHttpRequestHeader header("POST", m_likeBack->remotePath()); header.setValue("Host", m_likeBack->hostName()); diff --git a/src/linklabel.cpp b/src/linklabel.cpp index 6663f97..3c605c4 100644 --- a/src/linklabel.cpp +++ b/src/linklabel.cpp @@ -633,21 +633,21 @@ LinkLookEditWidget::LinkLookEditWidget(TDECModule *module, const TQString exTitl m_exTitle = exTitle; m_exIcon = exIcon; - connect( m_italic, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotChangeLook()) ); - connect( m_bold, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotChangeLook()) ); - connect( m_underlining, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLook()) ); - connect( m_color, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(slotChangeLook()) ); - connect( m_hoverColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(slotChangeLook()) ); - connect( m_iconSize, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLook()) ); - connect( m_preview, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLook()) ); - - connect( m_italic, TQT_SIGNAL(stateChanged(int)), module, TQT_SLOT(changed()) ); - connect( m_bold, TQT_SIGNAL(stateChanged(int)), module, TQT_SLOT(changed()) ); - connect( m_underlining, TQT_SIGNAL(activated(int)), module, TQT_SLOT(changed()) ); - connect( m_color, TQT_SIGNAL(changed(const TQColor&)), module, TQT_SLOT(changed()) ); - connect( m_hoverColor, TQT_SIGNAL(changed(const TQColor&)), module, TQT_SLOT(changed()) ); - connect( m_iconSize, TQT_SIGNAL(activated(int)), module, TQT_SLOT(changed()) ); - connect( m_preview, TQT_SIGNAL(activated(int)), module, TQT_SLOT(changed()) ); + connect( m_italic, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotChangeLook()) ); + connect( m_bold, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotChangeLook()) ); + connect( m_underlining, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeLook()) ); + connect( m_color, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(slotChangeLook()) ); + connect( m_hoverColor, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(slotChangeLook()) ); + connect( m_iconSize, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeLook()) ); + connect( m_preview, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeLook()) ); + + connect( m_italic, TQ_SIGNAL(stateChanged(int)), module, TQ_SLOT(changed()) ); + connect( m_bold, TQ_SIGNAL(stateChanged(int)), module, TQ_SLOT(changed()) ); + connect( m_underlining, TQ_SIGNAL(activated(int)), module, TQ_SLOT(changed()) ); + connect( m_color, TQ_SIGNAL(changed(const TQColor&)), module, TQ_SLOT(changed()) ); + connect( m_hoverColor, TQ_SIGNAL(changed(const TQColor&)), module, TQ_SLOT(changed()) ); + connect( m_iconSize, TQ_SIGNAL(activated(int)), module, TQ_SLOT(changed()) ); + connect( m_preview, TQ_SIGNAL(activated(int)), module, TQ_SLOT(changed()) ); } void LinkLookEditWidget::set(LinkLook *look) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 1c2b72d..e2e63a9 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -122,7 +122,7 @@ MainWindow::MainWindow(TQWidget *parent, const char *name) setAutoSaveSettings(/*groupName=*/TQString::fromLatin1("MainWindow"),true); m_actShowStatusbar->setChecked( statusBar()->isShown() ); - connect( m_baskets, TQT_SIGNAL(setWindowCaption(const TQString &)), this, TQT_SLOT(setCaption(const TQString &))); + connect( m_baskets, TQ_SIGNAL(setWindowCaption(const TQString &)), this, TQ_SLOT(setCaption(const TQString &))); // InlineEditors::instance()->richTextToolBar(); setStandardToolBarMenuEnabled(true); @@ -139,23 +139,23 @@ MainWindow::~MainWindow() void MainWindow::setupActions() { - actQuit = KStdAction::quit( this, TQT_SLOT(quit()), actionCollection() ); + actQuit = KStdAction::quit( this, TQ_SLOT(quit()), actionCollection() ); new TDEAction(i18n("Minimize"), "", 0, - this, TQT_SLOT(minimizeRestore()), actionCollection(), "minimizeRestore" ); + this, TQ_SLOT(minimizeRestore()), actionCollection(), "minimizeRestore" ); /** Settings : ************************************************************/ -// m_actShowToolbar = KStdAction::showToolbar( this, TQT_SLOT(toggleToolBar()), actionCollection()); - m_actShowStatusbar = KStdAction::showStatusbar( this, TQT_SLOT(toggleStatusBar()), actionCollection()); +// m_actShowToolbar = KStdAction::showToolbar( this, TQ_SLOT(toggleToolBar()), actionCollection()); + m_actShowStatusbar = KStdAction::showStatusbar( this, TQ_SLOT(toggleStatusBar()), actionCollection()); // m_actShowToolbar->setCheckedState( KGuiItem(i18n("Hide &Toolbar")) ); - (void) KStdAction::keyBindings( this, TQT_SLOT(showShortcutsSettingsDialog()), actionCollection() ); + (void) KStdAction::keyBindings( this, TQ_SLOT(showShortcutsSettingsDialog()), actionCollection() ); - (void) KStdAction::configureToolbars(this, TQT_SLOT(configureToolbars()), actionCollection() ); + (void) KStdAction::configureToolbars(this, TQ_SLOT(configureToolbars()), actionCollection() ); - //TDEAction *actCfgNotifs = KStdAction::configureNotifications(this, TQT_SLOT(configureNotifications()), actionCollection() ); + //TDEAction *actCfgNotifs = KStdAction::configureNotifications(this, TQ_SLOT(configureNotifications()), actionCollection() ); //actCfgNotifs->setEnabled(false); // Not yet implemented ! - actAppConfig = KStdAction::preferences( this, TQT_SLOT(showSettingsDialog()), actionCollection() ); + actAppConfig = KStdAction::preferences( this, TQ_SLOT(showSettingsDialog()), actionCollection() ); } /*void MainWindow::toggleToolBar() @@ -183,7 +183,7 @@ void MainWindow::configureToolbars() saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); - connect( &dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()) ); + connect( &dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig()) ); dlg.exec(); } diff --git a/src/newbasketdialog.cpp b/src/newbasketdialog.cpp index 18f1eb0..b10ff6b 100644 --- a/src/newbasketdialog.cpp +++ b/src/newbasketdialog.cpp @@ -53,8 +53,8 @@ SingleSelectionTDEIconView::SingleSelectionTDEIconView(TQWidget *parent, const char *name, WFlags f) : TDEIconView(parent, name, f), m_lastSelected(0) { - connect( this, TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQIconViewItem*)) ); - connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); + connect( this, TQ_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQ_SLOT(slotSelectionChanged(TQIconViewItem*)) ); + connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) ); } TQDragObject* SingleSelectionTDEIconView::dragObject() @@ -107,7 +107,7 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro TQToolTip::add(m_icon, i18n("Icon")); m_name = new TQLineEdit(/*i18n("Basket"), */page); m_name->setMinimumWidth(m_name->fontMetrics().maxWidth()*20); - connect( m_name, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(nameChanged(const TQString&)) ); + connect( m_name, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(nameChanged(const TQString&)) ); enableButtonOK(false); TQToolTip::add(m_name, i18n("Name")); m_backgroundColor = new KColorCombo2(TQColor(), TDEGlobalSettings::baseColor(), page); @@ -122,7 +122,7 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro TQHBoxLayout *layout = new TQHBoxLayout(/*parent=*/0, /*margin=*/0, spacingHint()); KPushButton *button = new KPushButton( KGuiItem(i18n("&Manage Templates..."), "configure"), page ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(manageTemplates()) ); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(manageTemplates()) ); button->hide(); // Compute the right template to use as the default: @@ -233,8 +233,8 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro m_basketsMap.insert(/*index=*/0, /*basket=*/0L); populateBasketsList(Global::bnpView->firstListViewItem(), /*indent=*/1, /*index=*/1); - connect( m_templates, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), this, TQT_SLOT(slotOk()) ); - connect( m_templates, TQT_SIGNAL(returnPressed(TQIconViewItem*)), this, TQT_SLOT(returnPressed()) ); + connect( m_templates, TQ_SIGNAL(doubleClicked(TQIconViewItem*)), this, TQ_SLOT(slotOk()) ); + connect( m_templates, TQ_SIGNAL(returnPressed(TQIconViewItem*)), this, TQ_SLOT(returnPressed()) ); if (parentBasket) { int index = 0; diff --git a/src/notecontent.cpp b/src/notecontent.cpp index c3629f6..cbe4d0d 100644 --- a/src/notecontent.cpp +++ b/src/notecontent.cpp @@ -930,9 +930,9 @@ bool AnimationContent::setMovie(const TQMovie &movie) return false; } m_movie = movie; - m_movie.connectUpdate( this, TQT_SLOT(movieUpdated(const TQRect&)) ); - m_movie.connectResize( this, TQT_SLOT(movieResized(const TQSize&)) ); - m_movie.connectStatus( this, TQT_SLOT(movieStatus(int)) ); + m_movie.connectUpdate( this, TQ_SLOT(movieUpdated(const TQRect&)) ); + m_movie.connectResize( this, TQ_SLOT(movieResized(const TQSize&)) ); + m_movie.connectStatus( this, TQ_SLOT(movieStatus(int)) ); contentChanged( m_movie.framePixmap().width() + 1 ); // TODO return true; } @@ -974,10 +974,10 @@ void AnimationContent::movieStatus(int status) note()->setContent(new ImageContent(note(), fileName())); basket()->save(); //delete this; // CRASH, as always !!!!!!!!! - //TQTimer::singleShot(0, this, TQT_SLOT(loadContent())); // Delayed to avoid crash! - //TQTimer::singleShot(100, this, TQT_SLOT(saveProperties())); // We should save it's an image and not an animation + //TQTimer::singleShot(0, this, TQ_SLOT(loadContent())); // Delayed to avoid crash! + //TQTimer::singleShot(100, this, TQ_SLOT(saveProperties())); // We should save it's an image and not an animation // if (note()->isFocused()) -// TQTimer::singleShot(25, note(), TQT_SLOT(delayedEnsureVisible())); +// TQTimer::singleShot(25, note(), TQ_SLOT(delayedEnsureVisible())); } else m_oldStatus = status; @@ -1138,8 +1138,8 @@ void FileContent::startFetchingUrlPreview() KURL::List urlList; urlList.append(filteredUrl); m_previewJob = TDEIO::filePreview(urlList, linkLook->previewSize(), linkLook->previewSize(), linkLook->iconSize()); - connect( m_previewJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQT_SLOT(newPreview(const KFileItem*, const TQPixmap&)) ); - connect( m_previewJob, TQT_SIGNAL(failed(const KFileItem*)), this, TQT_SLOT(removePreview(const KFileItem*)) ); + connect( m_previewJob, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQ_SLOT(newPreview(const KFileItem*, const TQPixmap&)) ); + connect( m_previewJob, TQ_SIGNAL(failed(const KFileItem*)), this, TQ_SLOT(removePreview(const KFileItem*)) ); } } @@ -1350,8 +1350,8 @@ void LinkContent::startFetchingUrlPreview() KURL::List urlList; urlList.append(filteredUrl); m_previewJob = TDEIO::filePreview(urlList, linkLook->previewSize(), linkLook->previewSize(), linkLook->iconSize()); - connect( m_previewJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQT_SLOT(newPreview(const KFileItem*, const TQPixmap&)) ); - connect( m_previewJob, TQT_SIGNAL(failed(const KFileItem*)), this, TQT_SLOT(removePreview(const KFileItem*)) ); + connect( m_previewJob, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQ_SLOT(newPreview(const KFileItem*, const TQPixmap&)) ); + connect( m_previewJob, TQ_SIGNAL(failed(const KFileItem*)), this, TQ_SLOT(removePreview(const KFileItem*)) ); } } diff --git a/src/notedrag.cpp b/src/notedrag.cpp index c4275d0..00d04a1 100644 --- a/src/notedrag.cpp +++ b/src/notedrag.cpp @@ -488,8 +488,8 @@ Note* NoteDrag::decodeHierarchy(TQDataStream &stream, Basket *parent, bool moveF note->content()->setFileName(newFileName); TDEIO::FileCopyJob *copyJob = TDEIO::file_move(KURL(fullPath), KURL(parent->fullPath() + newFileName), /*perms=*/-1, /*override=*/true, /*resume=*/false, /*showProgressInfo=*/false); - parent->connect( copyJob, TQT_SIGNAL(result(TDEIO::Job *)), - parent, TQT_SLOT(slotCopyingDone2(TDEIO::Job *)) ); + parent->connect( copyJob, TQ_SIGNAL(result(TDEIO::Job *)), + parent, TQ_SLOT(slotCopyingDone2(TDEIO::Job *)) ); } note->setGroupWidth(groupWidth); note->setParentNote(0); @@ -514,8 +514,8 @@ Note* NoteDrag::decodeHierarchy(TQDataStream &stream, Basket *parent, bool moveF else copyJob = TDEIO::file_copy(KURL(fullPath), KURL(parent->fullPath() + newFileName), /*perms=*/-1, /*override=*/true, /*resume=*/false, /*showProgressInfo=*/false); - parent->connect( copyJob, TQT_SIGNAL(result(TDEIO::Job *)), - parent, TQT_SLOT(slotCopyingDone2(TDEIO::Job *)) ); + parent->connect( copyJob, TQ_SIGNAL(result(TDEIO::Job *)), + parent, TQ_SLOT(slotCopyingDone2(TDEIO::Job *)) ); note->setGroupWidth(groupWidth); note->setAddedDate(addedDate); note->setLastModificationDate(lastModificationDate); diff --git a/src/noteedit.cpp b/src/noteedit.cpp index 6261c6c..a3798e3 100644 --- a/src/noteedit.cpp +++ b/src/noteedit.cpp @@ -149,12 +149,12 @@ TextEditor::TextEditor(TextContent *textContent, TQWidget *parent) textEdit->moveCursor(KTextEdit::MoveEnd, false); // FIXME: Sometimes, the cursor flicker at ends before being positionned where clicked (because kapp->processEvents() I think) textEdit->verticalScrollBar()->setCursor(TQt::ArrowCursor); setInlineEditor(textEdit); - connect( textEdit, TQT_SIGNAL(escapePressed()), this, TQT_SIGNAL(askValidation()) ); - connect( textEdit, TQT_SIGNAL(mouseEntered()), this, TQT_SIGNAL(mouseEnteredEditorWidget()) ); + connect( textEdit, TQ_SIGNAL(escapePressed()), this, TQ_SIGNAL(askValidation()) ); + connect( textEdit, TQ_SIGNAL(mouseEntered()), this, TQ_SIGNAL(mouseEnteredEditorWidget()) ); - connect( textEdit, TQT_SIGNAL(cursorPositionChanged(int, int)), textContent->note()->basket(), TQT_SLOT(editorCursorPositionChanged()) ); + connect( textEdit, TQ_SIGNAL(cursorPositionChanged(int, int)), textContent->note()->basket(), TQ_SLOT(editorCursorPositionChanged()) ); // In case it is a very big note, the top is displayed and Enter is pressed: the cursor is on bottom, we should enure it visible: - TQTimer::singleShot( 0, textContent->note()->basket(), TQT_SLOT(editorCursorPositionChanged()) ); + TQTimer::singleShot( 0, textContent->note()->basket(), TQ_SLOT(editorCursorPositionChanged()) ); } TextEditor::~TextEditor() @@ -220,58 +220,58 @@ HtmlEditor::HtmlEditor(HtmlContent *htmlContent, TQWidget *parent) textEdit->verticalScrollBar()->setCursor(TQt::ArrowCursor); setInlineEditor(textEdit); - connect( textEdit, TQT_SIGNAL(mouseEntered()), this, TQT_SIGNAL(mouseEnteredEditorWidget()) ); - connect( textEdit, TQT_SIGNAL(escapePressed()), this, TQT_SIGNAL(askValidation()) ); + connect( textEdit, TQ_SIGNAL(mouseEntered()), this, TQ_SIGNAL(mouseEnteredEditorWidget()) ); + connect( textEdit, TQ_SIGNAL(escapePressed()), this, TQ_SIGNAL(askValidation()) ); - connect( InlineEditors::instance()->richTextFont, TQT_SIGNAL(textChanged(const TQString&)), textEdit, TQT_SLOT(setFamily(const TQString&)) ); - connect( InlineEditors::instance()->richTextFontSize, TQT_SIGNAL(sizeChanged(int)), textEdit, TQT_SLOT(setPointSize(int)) ); - connect( InlineEditors::instance()->richTextColor, TQT_SIGNAL(activated(const TQColor&)), textEdit, TQT_SLOT(setColor(const TQColor&)) ); + connect( InlineEditors::instance()->richTextFont, TQ_SIGNAL(textChanged(const TQString&)), textEdit, TQ_SLOT(setFamily(const TQString&)) ); + connect( InlineEditors::instance()->richTextFontSize, TQ_SIGNAL(sizeChanged(int)), textEdit, TQ_SLOT(setPointSize(int)) ); + connect( InlineEditors::instance()->richTextColor, TQ_SIGNAL(activated(const TQColor&)), textEdit, TQ_SLOT(setColor(const TQColor&)) ); - connect( InlineEditors::instance()->richTextFont, TQT_SIGNAL(escapePressed()), textEdit, TQT_SLOT(setFocus()) ); - connect( InlineEditors::instance()->richTextFont, TQT_SIGNAL(returnPressed2()), textEdit, TQT_SLOT(setFocus()) ); - connect( InlineEditors::instance()->richTextFont, TQT_SIGNAL(activated(int)), textEdit, TQT_SLOT(setFocus()) ); + connect( InlineEditors::instance()->richTextFont, TQ_SIGNAL(escapePressed()), textEdit, TQ_SLOT(setFocus()) ); + connect( InlineEditors::instance()->richTextFont, TQ_SIGNAL(returnPressed2()), textEdit, TQ_SLOT(setFocus()) ); + connect( InlineEditors::instance()->richTextFont, TQ_SIGNAL(activated(int)), textEdit, TQ_SLOT(setFocus()) ); - connect( InlineEditors::instance()->richTextFontSize, TQT_SIGNAL(escapePressed()), textEdit, TQT_SLOT(setFocus()) ); - connect( InlineEditors::instance()->richTextFontSize, TQT_SIGNAL(returnPressed2()), textEdit, TQT_SLOT(setFocus()) ); - connect( InlineEditors::instance()->richTextFontSize, TQT_SIGNAL(activated(int)), textEdit, TQT_SLOT(setFocus()) ); + connect( InlineEditors::instance()->richTextFontSize, TQ_SIGNAL(escapePressed()), textEdit, TQ_SLOT(setFocus()) ); + connect( InlineEditors::instance()->richTextFontSize, TQ_SIGNAL(returnPressed2()), textEdit, TQ_SLOT(setFocus()) ); + connect( InlineEditors::instance()->richTextFontSize, TQ_SIGNAL(activated(int)), textEdit, TQ_SLOT(setFocus()) ); - connect( InlineEditors::instance()->richTextColor, TQT_SIGNAL(escapePressed()), textEdit, TQT_SLOT(setFocus()) ); - connect( InlineEditors::instance()->richTextColor, TQT_SIGNAL(returnPressed2()), textEdit, TQT_SLOT(setFocus()) ); + connect( InlineEditors::instance()->richTextColor, TQ_SIGNAL(escapePressed()), textEdit, TQ_SLOT(setFocus()) ); + connect( InlineEditors::instance()->richTextColor, TQ_SIGNAL(returnPressed2()), textEdit, TQ_SLOT(setFocus()) ); - connect( textEdit, TQT_SIGNAL(cursorPositionChanged(int, int)), this, TQT_SLOT(cursorPositionChanged()) ); - connect( textEdit, TQT_SIGNAL(clicked(int, int)), this, TQT_SLOT(cursorPositionChanged()) ); - connect( textEdit, TQT_SIGNAL(currentFontChanged(const TQFont&)), this, TQT_SLOT(fontChanged(const TQFont&)) ); -// connect( textEdit, TQT_SIGNAL(currentVerticalAlignmentChanged(TQTextEdit::VerticalAlignment)), this, TQT_SLOT(slotVerticalAlignmentChanged()) ); + connect( textEdit, TQ_SIGNAL(cursorPositionChanged(int, int)), this, TQ_SLOT(cursorPositionChanged()) ); + connect( textEdit, TQ_SIGNAL(clicked(int, int)), this, TQ_SLOT(cursorPositionChanged()) ); + connect( textEdit, TQ_SIGNAL(currentFontChanged(const TQFont&)), this, TQ_SLOT(fontChanged(const TQFont&)) ); +// connect( textEdit, TQ_SIGNAL(currentVerticalAlignmentChanged(TQTextEdit::VerticalAlignment)), this, TQ_SLOT(slotVerticalAlignmentChanged()) ); - connect( InlineEditors::instance()->richTextBold, TQT_SIGNAL(toggled(bool)), textEdit, TQT_SLOT(setBold(bool)) ); - connect( InlineEditors::instance()->richTextItalic, TQT_SIGNAL(toggled(bool)), textEdit, TQT_SLOT(setItalic(bool)) ); - connect( InlineEditors::instance()->richTextUnderline, TQT_SIGNAL(toggled(bool)), textEdit, TQT_SLOT(setUnderline(bool)) ); + connect( InlineEditors::instance()->richTextBold, TQ_SIGNAL(toggled(bool)), textEdit, TQ_SLOT(setBold(bool)) ); + connect( InlineEditors::instance()->richTextItalic, TQ_SIGNAL(toggled(bool)), textEdit, TQ_SLOT(setItalic(bool)) ); + connect( InlineEditors::instance()->richTextUnderline, TQ_SIGNAL(toggled(bool)), textEdit, TQ_SLOT(setUnderline(bool)) ); //REMOVE: - //connect( InlineEditors::instance()->richTextBold, TQT_SIGNAL(activated()), this, TQT_SLOT(setBold()) ); - //connect( InlineEditors::instance()->richTextItalic, TQT_SIGNAL(activated()), this, TQT_SLOT(setItalic()) ); - //connect( InlineEditors::instance()->richTextUnderline, TQT_SIGNAL(activated()), this, TQT_SLOT(setUnderline()) ); - connect( InlineEditors::instance()->richTextLeft, TQT_SIGNAL(activated()), this, TQT_SLOT(setLeft()) ); - connect( InlineEditors::instance()->richTextCenter, TQT_SIGNAL(activated()), this, TQT_SLOT(setCentered()) ); - connect( InlineEditors::instance()->richTextRight, TQT_SIGNAL(activated()), this, TQT_SLOT(setRight()) ); - connect( InlineEditors::instance()->richTextJustified, TQT_SIGNAL(activated()), this, TQT_SLOT(setBlock()) ); + //connect( InlineEditors::instance()->richTextBold, TQ_SIGNAL(activated()), this, TQ_SLOT(setBold()) ); + //connect( InlineEditors::instance()->richTextItalic, TQ_SIGNAL(activated()), this, TQ_SLOT(setItalic()) ); + //connect( InlineEditors::instance()->richTextUnderline, TQ_SIGNAL(activated()), this, TQ_SLOT(setUnderline()) ); + connect( InlineEditors::instance()->richTextLeft, TQ_SIGNAL(activated()), this, TQ_SLOT(setLeft()) ); + connect( InlineEditors::instance()->richTextCenter, TQ_SIGNAL(activated()), this, TQ_SLOT(setCentered()) ); + connect( InlineEditors::instance()->richTextRight, TQ_SIGNAL(activated()), this, TQ_SLOT(setRight()) ); + connect( InlineEditors::instance()->richTextJustified, TQ_SIGNAL(activated()), this, TQ_SLOT(setBlock()) ); // InlineEditors::instance()->richTextToolBar()->show(); cursorPositionChanged(); fontChanged(textEdit->currentFont()); - //TQTimer::singleShot( 0, this, TQT_SLOT(cursorPositionChanged()) ); + //TQTimer::singleShot( 0, this, TQ_SLOT(cursorPositionChanged()) ); InlineEditors::instance()->enableRichTextToolBar(); - connect( InlineEditors::instance()->richTextUndo, TQT_SIGNAL(activated()), textEdit, TQT_SLOT(undo()) ); - connect( InlineEditors::instance()->richTextRedo, TQT_SIGNAL(activated()), textEdit, TQT_SLOT(redo()) ); - connect( textEdit, TQT_SIGNAL(undoAvailable(bool)), InlineEditors::instance()->richTextUndo, TQT_SLOT(setEnabled(bool)) ); - connect( textEdit, TQT_SIGNAL(redoAvailable(bool)), InlineEditors::instance()->richTextRedo, TQT_SLOT(setEnabled(bool)) ); - connect( textEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(textChanged())); + connect( InlineEditors::instance()->richTextUndo, TQ_SIGNAL(activated()), textEdit, TQ_SLOT(undo()) ); + connect( InlineEditors::instance()->richTextRedo, TQ_SIGNAL(activated()), textEdit, TQ_SLOT(redo()) ); + connect( textEdit, TQ_SIGNAL(undoAvailable(bool)), InlineEditors::instance()->richTextUndo, TQ_SLOT(setEnabled(bool)) ); + connect( textEdit, TQ_SIGNAL(redoAvailable(bool)), InlineEditors::instance()->richTextRedo, TQ_SLOT(setEnabled(bool)) ); + connect( textEdit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(textChanged())); InlineEditors::instance()->richTextUndo->setEnabled(false); InlineEditors::instance()->richTextRedo->setEnabled(false); - connect( textEdit, TQT_SIGNAL(cursorPositionChanged(int, int)), htmlContent->note()->basket(), TQT_SLOT(editorCursorPositionChanged()) ); + connect( textEdit, TQ_SIGNAL(cursorPositionChanged(int, int)), htmlContent->note()->basket(), TQ_SLOT(editorCursorPositionChanged()) ); // In case it is a very big note, the top is displayed and Enter is pressed: the cursor is on bottom, we should enure it visible: - TQTimer::singleShot( 0, htmlContent->note()->basket(), TQT_SLOT(editorCursorPositionChanged()) ); + TQTimer::singleShot( 0, htmlContent->note()->basket(), TQ_SLOT(editorCursorPositionChanged()) ); } void HtmlEditor::cursorPositionChanged() @@ -426,9 +426,9 @@ FileEditor::FileEditor(FileContent *fileContent, TQWidget *parent) lineEdit->setText(m_fileContent->fileName()); lineEdit->selectAll(); setInlineEditor(lineEdit); - connect( lineEdit, TQT_SIGNAL(returnPressed()), this, TQT_SIGNAL(askValidation()) ); - connect( lineEdit, TQT_SIGNAL(escapePressed()), this, TQT_SIGNAL(askValidation()) ); - connect( lineEdit, TQT_SIGNAL(mouseEntered()), this, TQT_SIGNAL(mouseEnteredEditorWidget()) ); + connect( lineEdit, TQ_SIGNAL(returnPressed()), this, TQ_SIGNAL(askValidation()) ); + connect( lineEdit, TQ_SIGNAL(escapePressed()), this, TQ_SIGNAL(askValidation()) ); + connect( lineEdit, TQ_SIGNAL(mouseEntered()), this, TQ_SIGNAL(mouseEnteredEditorWidget()) ); } FileEditor::~FileEditor() @@ -590,11 +590,11 @@ LinkEditDialog::LinkEditDialog(LinkContent *contentNote, TQWidget *parent/*, TQK layout->addWidget(wid, 2, 1, TQt::AlignVCenter); m_isAutoModified = false; - connect( m_url, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(urlChanged(const TQString&)) ); - connect( m_title, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(doNotAutoTitle(const TQString&)) ); - connect( m_icon, TQT_SIGNAL(iconChanged(TQString)) , this, TQT_SLOT(doNotAutoIcon(TQString)) ); - connect( m_autoTitle, TQT_SIGNAL(clicked()), this, TQT_SLOT(guessTitle()) ); - connect( m_autoIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(guessIcon()) ); + connect( m_url, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(urlChanged(const TQString&)) ); + connect( m_title, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(doNotAutoTitle(const TQString&)) ); + connect( m_icon, TQ_SIGNAL(iconChanged(TQString)) , this, TQ_SLOT(doNotAutoIcon(TQString)) ); + connect( m_autoTitle, TQ_SIGNAL(clicked()), this, TQ_SLOT(guessTitle()) ); + connect( m_autoIcon, TQ_SIGNAL(clicked()), this, TQ_SLOT(guessIcon()) ); TQWidget *stretchWidget = new TQWidget(page); stretchWidget->setSizePolicy(TQSizePolicy(/*hor=*/TQSizePolicy::Fixed, /*ver=*/TQSizePolicy::Expanding, /*hStretch=*/1, /*vStretch=*/255)); // Make it fill ALL vertical space @@ -741,7 +741,7 @@ LauncherEditDialog::LauncherEditDialog(LauncherContent *contentNote, TQWidget *p stretchWidget->setSizePolicy(TQSizePolicy(/*hor=*/TQSizePolicy::Fixed, /*ver=*/TQSizePolicy::Expanding, /*hStretch=*/1, /*vStretch=*/255)); // Make it fill ALL vertical space layout->addWidget(stretchWidget, 3, 1, TQt::AlignVCenter); - connect( guessButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(guessIcon()) ); + connect( guessButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(guessIcon()) ); } LauncherEditDialog::~LauncherEditDialog() @@ -822,7 +822,7 @@ void InlineEditors::initToolBars(TDEActionCollection *actionCollection) richTextColor = new FocusedColorCombo(Global::mainWindow()); richTextColor->setFixedWidth(richTextColor->sizeHint().height() * 2); richTextColor->setColor(textColor); - action = new KWidgetAction(richTextColor, i18n("Color"), TDEShortcut(), 0, TQT_SLOT(), actionCollection, "richtext_color"); + action = new KWidgetAction(richTextColor, i18n("Color"), TDEShortcut(), 0, TQ_SLOT(), actionCollection, "richtext_color"); richTextBold = new TDEToggleAction( i18n("Bold"), "format-text-bold", "Ctrl+B", actionCollection, "richtext_bold" ); richTextItalic = new TDEToggleAction( i18n("Italic"), "format-text-italic", "Ctrl+I", actionCollection, "richtext_italic" ); diff --git a/src/notefactory.cpp b/src/notefactory.cpp index 7195640..350c9a0 100644 --- a/src/notefactory.cpp +++ b/src/notefactory.cpp @@ -689,14 +689,14 @@ Note* NoteFactory::copyFileAndLoad(const KURL &url, Basket *parent) // TDEIO::CopyJob *copyJob = TDEIO::copy(url, KURL(fullPath)); -// parent->connect( copyJob, TQT_SIGNAL(copyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)), -// parent, TQT_SLOT(slotCopyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)) ); +// parent->connect( copyJob, TQ_SIGNAL(copyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)), +// parent, TQ_SLOT(slotCopyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)) ); TDEIO::FileCopyJob *copyJob = new TDEIO::FileCopyJob( url, KURL(fullPath), 0666, /*move=*/false, /*overwrite=*/true, /*resume=*/true, /*showProgress=*/true ); - parent->connect( copyJob, TQT_SIGNAL(result(TDEIO::Job *)), - parent, TQT_SLOT(slotCopyingDone2(TDEIO::Job *)) ); + parent->connect( copyJob, TQ_SIGNAL(result(TDEIO::Job *)), + parent, TQ_SLOT(slotCopyingDone2(TDEIO::Job *)) ); NoteType::Id type = typeForURL(url, parent); // Use the type of the original file because the target doesn't exist yet @@ -717,14 +717,14 @@ Note* NoteFactory::moveFileAndLoad(const KURL &url, Basket *parent) // TDEIO::CopyJob *copyJob = TDEIO::move(url, KURL(fullPath)); -// parent->connect( copyJob, TQT_SIGNAL(copyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)), -// parent, TQT_SLOT(slotCopyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)) ); +// parent->connect( copyJob, TQ_SIGNAL(copyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)), +// parent, TQ_SLOT(slotCopyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)) ); TDEIO::FileCopyJob *copyJob = new TDEIO::FileCopyJob( url, KURL(fullPath), 0666, /*move=*/true, /*overwrite=*/true, /*resume=*/true, /*showProgress=*/true ); - parent->connect( copyJob, TQT_SIGNAL(result(TDEIO::Job *)), - parent, TQT_SLOT(slotCopyingDone2(TDEIO::Job *)) ); + parent->connect( copyJob, TQ_SIGNAL(result(TDEIO::Job *)), + parent, TQ_SLOT(slotCopyingDone2(TDEIO::Job *)) ); NoteType::Id type = typeForURL(url, parent); // Use the type of the original file because the target doesn't exist yet diff --git a/src/qeffects.cpp b/src/qeffects.cpp index 73dbf6a..8d67a95 100644 --- a/src/qeffects.cpp +++ b/src/qeffects.cpp @@ -125,7 +125,7 @@ void TQAlphaWidget::run( int time ) show(); setEnabled(FALSE); - connect( &anim, TQT_SIGNAL(timeout()), this, TQT_SLOT(render())); + connect( &anim, TQ_SIGNAL(timeout()), this, TQ_SLOT(render())); anim.start( 1 ); } else { duration = 0; @@ -434,7 +434,7 @@ void TQRollEffect::run( int time ) duration = TQMIN( TQMAX( dist/3, 50 ), 120 ); } - connect( &anim, TQT_SIGNAL(timeout()), this, TQT_SLOT(scroll())); + connect( &anim, TQ_SIGNAL(timeout()), this, TQ_SLOT(scroll())); widget->setWState( WState_Visible ); diff --git a/src/regiongrabber.cpp b/src/regiongrabber.cpp index de7a19a..9497b8a 100644 --- a/src/regiongrabber.cpp +++ b/src/regiongrabber.cpp @@ -76,9 +76,9 @@ RegionGrabber::RegionGrabber(int delay) sizeTip = new SizeTip( ( TQWidget * )0L ); tipTimer = new TQTimer( this ); - connect( tipTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateSizeTip() ) ); + connect( tipTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateSizeTip() ) ); - TQTimer::singleShot( delay, this, TQT_SLOT( initGrabber() ) ); + TQTimer::singleShot( delay, this, TQ_SLOT( initGrabber() ) ); } RegionGrabber::~RegionGrabber() diff --git a/src/settings.cpp b/src/settings.cpp index 4327847..3f5f31b 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -375,7 +375,7 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name) label = new TQLabel(m_treeOnLeft, i18n("&Basket tree position:"), this); gl->addWidget(label, 0, 0); gl->addWidget(m_treeOnLeft, 0, 1); - connect( m_treeOnLeft, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()) ); + connect( m_treeOnLeft, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()) ); // Filter Bar Position: m_filterOnTop = new TQComboBox(this); @@ -384,12 +384,12 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name) label = new TQLabel(m_filterOnTop, i18n("&Filter bar position:"), this); gl->addWidget(label, 1, 0); gl->addWidget(m_filterOnTop, 1, 1); - connect( m_filterOnTop, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()) ); + connect( m_filterOnTop, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()) ); // Use Baloons to Report Results of Global Actions: hLay = new TQHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); m_usePassivePopup = new TQCheckBox(i18n("&Use balloons to report results of global actions"), this); - connect( m_usePassivePopup, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) ); + connect( m_usePassivePopup, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) ); hLabel = new HelpLabel( i18n("What are global actions?"), ("<p>" + i18n("You can configure global shortcuts to do some actions without having to show the main window. For instance, you can paste the clipboard content, take a color from " @@ -412,7 +412,7 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name) // Dock in System Tray: m_useSystray = new TQCheckBox(i18n("&Dock in system tray"), gbSys); sysLay->addWidget(m_useSystray); - connect( m_useSystray, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) ); + connect( m_useSystray, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) ); m_systray = new TQWidget(gbSys); TQVBoxLayout *subSysLay = new TQVBoxLayout(m_systray, /*margin=*/0, KDialogBase::spacingHint()); @@ -421,7 +421,7 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name) // Show Current Basket Icon in System Tray Icon: m_showIconInSystray = new TQCheckBox(i18n("&Show current basket icon in system tray icon"), m_systray); subSysLay->addWidget(m_showIconInSystray); - connect(m_showIconInSystray, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed())); + connect(m_showIconInSystray, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed())); TQGridLayout *gs = new TQGridLayout(0, /*nRows=*/2, /*nCols=*/3); subSysLay->addLayout(gs); @@ -434,8 +434,8 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name) m_timeToHideOnMouseOut->setSuffix(i18n(" tenths of seconds")); gs->addWidget(m_hideOnMouseOut, 0, 0); gs->addWidget(m_timeToHideOnMouseOut, 0, 1); - connect(m_hideOnMouseOut, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed())); - connect(m_timeToHideOnMouseOut, TQT_SIGNAL(valueChanged (int)), this, TQT_SLOT(changed())); + connect(m_hideOnMouseOut, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed())); + connect(m_timeToHideOnMouseOut, TQ_SIGNAL(valueChanged (int)), this, TQ_SLOT(changed())); // subSysLay->addWidget( // Show Main Window when Mouse Hovers over the System Tray Icon for Some Time: @@ -445,13 +445,13 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name) m_timeToShowOnMouseIn->setSuffix(i18n(" tenths of seconds")); gs->addWidget(m_showOnMouseIn, 1, 0); gs->addWidget(m_timeToShowOnMouseIn, 1, 1); - connect(m_showOnMouseIn, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed())); - connect(m_timeToShowOnMouseIn, TQT_SIGNAL(valueChanged (int)), this, TQT_SLOT(changed())); + connect(m_showOnMouseIn, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed())); + connect(m_timeToShowOnMouseIn, TQ_SIGNAL(valueChanged (int)), this, TQ_SLOT(changed())); - connect( m_hideOnMouseOut, TQT_SIGNAL(toggled(bool)), m_timeToHideOnMouseOut, TQT_SLOT(setEnabled(bool)) ); - connect( m_showOnMouseIn, TQT_SIGNAL(toggled(bool)), m_timeToShowOnMouseIn, TQT_SLOT(setEnabled(bool)) ); + connect( m_hideOnMouseOut, TQ_SIGNAL(toggled(bool)), m_timeToHideOnMouseOut, TQ_SLOT(setEnabled(bool)) ); + connect( m_showOnMouseIn, TQ_SIGNAL(toggled(bool)), m_timeToShowOnMouseIn, TQ_SLOT(setEnabled(bool)) ); - connect( m_useSystray, TQT_SIGNAL(toggled(bool)), m_systray, TQT_SLOT(setEnabled(bool)) ); + connect( m_useSystray, TQ_SIGNAL(toggled(bool)), m_systray, TQ_SLOT(setEnabled(bool)) ); layout->insertStretch(-1); load(); @@ -515,13 +515,13 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name) layout->addWidget(appearanceBox); m_playAnimations = new TQCheckBox(i18n("Ani&mate changes in baskets"), appearanceBox); - connect( m_playAnimations, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) ); + connect( m_playAnimations, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) ); m_showNotesToolTip = new TQCheckBox(i18n("&Show tooltips in baskets"), appearanceBox); - connect( m_showNotesToolTip, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) ); + connect( m_showNotesToolTip, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) ); m_bigNotes = new TQCheckBox(i18n("&Big notes"), appearanceBox); - connect( m_bigNotes, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) ); + connect( m_bigNotes, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) ); // Behavior: @@ -529,15 +529,15 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name) layout->addWidget(behaviorBox); m_autoBullet = new TQCheckBox(i18n("&Transform lines starting with * or - to lists in text editors"), behaviorBox); - connect( m_autoBullet, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) ); + connect( m_autoBullet, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) ); m_confirmNoteDeletion = new TQCheckBox(i18n("Ask confirmation before &deleting notes"), behaviorBox); - connect( m_confirmNoteDeletion, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) ); + connect( m_confirmNoteDeletion, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) ); TQWidget *widget = new TQWidget(behaviorBox); hLay = new TQHBoxLayout(widget, /*margin=*/0, KDialogBase::spacingHint()); m_exportTextTags = new TQCheckBox(i18n("&Export tags in texts"), widget); - connect( m_exportTextTags, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) ); + connect( m_exportTextTags, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) ); TQPixmap pixmapHelp(TDEGlobal::dirs()->findResource("data", "basket/images/tag_export_help.png")); TQMimeSourceFactory::defaultFactory()->setPixmap("__resource_help_tag_export.png", pixmapHelp); @@ -570,7 +570,7 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name) hLayV->addWidget(helpV); hLayV->insertStretch(-1); layout->addWidget(m_groupOnInsertionLineWidget); - connect(m_groupOnInsertionLine, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed())); + connect(m_groupOnInsertionLine, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed())); widget = new TQWidget(behaviorBox); TQGridLayout *ga = new TQGridLayout(widget, /*nRows=*/3, /*nCols=*/4, /*margin=*/0, KDialogBase::spacingHint()); @@ -592,7 +592,7 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name) ga->addWidget(labelM, 0, 0); ga->addWidget(m_middleAction, 0, 1); ga->addWidget(new TQLabel(i18n("at cursor position"), widget), 0, 2); - connect( m_middleAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()) ); + connect( m_middleAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()) ); // Protection: @@ -612,14 +612,14 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name) //hLay->addWidget(label); hLay->addStretch(); // layout->addLayout(hLay); - connect( m_enableReLockTimeoutMinutes, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) ); - connect( m_reLockTimeoutMinutes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()) ); - connect( m_enableReLockTimeoutMinutes, TQT_SIGNAL(toggled(bool)), m_reLockTimeoutMinutes, TQT_SLOT(setEnabled(bool)) ); + connect( m_enableReLockTimeoutMinutes, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) ); + connect( m_reLockTimeoutMinutes, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()) ); + connect( m_enableReLockTimeoutMinutes, TQ_SIGNAL(toggled(bool)), m_reLockTimeoutMinutes, TQ_SLOT(setEnabled(bool)) ); #ifdef HAVE_LIBGPGME m_useGnuPGAgent = new TQCheckBox(i18n("Use GnuPG agent for &private/public key protected baskets"), protectionBox); // hLay->addWidget(m_useGnuPGAgent); - connect( m_useGnuPGAgent, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) ); + connect( m_useGnuPGAgent, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) ); #endif layout->insertStretch(-1); @@ -703,7 +703,7 @@ NewNotesPage::NewNotesPage(TQWidget * parent, const char * name) //layout->addLayout(hLay); label->hide(); m_newNotesPlace->hide(); - connect( m_newNotesPlace, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()) ); + connect( m_newNotesPlace, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()) ); // New Images Size: @@ -712,7 +712,7 @@ NewNotesPage::NewNotesPage(TQWidget * parent, const char * name) m_imgSizeX->setMinValue(1); m_imgSizeX->setMaxValue(4096); m_imgSizeX->setReferencePoint(100); - connect( m_imgSizeX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()) ); + connect( m_imgSizeX, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()) ); label = new TQLabel(m_imgSizeX, i18n("&New images size:"), this); hLay->addWidget(label); hLay->addWidget(m_imgSizeX); @@ -720,7 +720,7 @@ NewNotesPage::NewNotesPage(TQWidget * parent, const char * name) m_imgSizeY->setMinValue(1); m_imgSizeY->setMaxValue(4096); m_imgSizeY->setReferencePoint(100); - connect( m_imgSizeY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()) ); + connect( m_imgSizeY, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()) ); label = new TQLabel(m_imgSizeY, i18n("&by"), this); hLay->addWidget(label); hLay->addWidget(m_imgSizeY); @@ -730,7 +730,7 @@ NewNotesPage::NewNotesPage(TQWidget * parent, const char * name) hLay->addWidget(m_pushVisualize); hLay->addStretch(); layout->addLayout(hLay); - connect( m_pushVisualize, TQT_SIGNAL(clicked()), this, TQT_SLOT(visualize()) ); + connect( m_pushVisualize, TQ_SIGNAL(clicked()), this, TQ_SLOT(visualize()) ); // View File Content: @@ -740,10 +740,10 @@ NewNotesPage::NewNotesPage(TQWidget * parent, const char * name) m_viewImageFileContent = new TQCheckBox( i18n("&Image or animation"), buttonGroup ); m_viewSoundFileContent = new TQCheckBox( i18n("&Sound"), buttonGroup ); layout->addWidget(buttonGroup); - connect( m_viewTextFileContent, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) ); - connect( m_viewHtmlFileContent, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) ); - connect( m_viewImageFileContent, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) ); - connect( m_viewSoundFileContent, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) ); + connect( m_viewTextFileContent, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) ); + connect( m_viewHtmlFileContent, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) ); + connect( m_viewImageFileContent, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) ); + connect( m_viewSoundFileContent, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) ); layout->insertStretch(-1); load(); @@ -848,32 +848,32 @@ ApplicationsPage::ApplicationsPage(TQWidget * parent, const char * name) TQHBoxLayout *hLayH = new TQHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); hLayH->insertSpacing(-1, 20); hLayH->addWidget(m_htmlProg); - connect(m_htmlUseProg, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed())); - connect(m_htmlProg->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(m_htmlUseProg, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed())); + connect(m_htmlProg->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); m_imageUseProg = new TQCheckBox(i18n("Open &image notes with a custom application:"), this); m_imageProg = new RunCommandRequester("", i18n("Open image notes with:"), this); TQHBoxLayout *hLayI = new TQHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); hLayI->insertSpacing(-1, 20); hLayI->addWidget(m_imageProg); - connect(m_imageUseProg, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed())); - connect(m_imageProg->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(m_imageUseProg, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed())); + connect(m_imageProg->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); m_animationUseProg = new TQCheckBox(i18n("Open a&nimation notes with a custom application:"), this); m_animationProg = new RunCommandRequester("", i18n("Open animation notes with:"), this); TQHBoxLayout *hLayA = new TQHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); hLayA->insertSpacing(-1, 20); hLayA->addWidget(m_animationProg); - connect(m_animationUseProg, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed())); - connect(m_animationProg->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(m_animationUseProg, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed())); + connect(m_animationProg->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); m_soundUseProg = new TQCheckBox(i18n("Open so&und notes with a custom application:"), this); m_soundProg = new RunCommandRequester("", i18n("Open sound notes with:"), this); TQHBoxLayout *hLayS = new TQHBoxLayout(0L, /*margin=*/0, KDialogBase::spacingHint()); hLayS->insertSpacing(-1, 20); hLayS->addWidget(m_soundProg); - connect(m_soundUseProg, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed())); - connect(m_soundProg->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(m_soundUseProg, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed())); + connect(m_soundProg->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); TQString whatsthis = i18n( "<p>If checked, the application defined below will be used when opening that type of note.</p>" @@ -943,10 +943,10 @@ ApplicationsPage::ApplicationsPage(TQWidget * parent, const char * name) hLay->addStretch(); layout->addLayout(hLay); - connect( m_htmlUseProg, TQT_SIGNAL(toggled(bool)), m_htmlProg, TQT_SLOT(setEnabled(bool)) ); - connect( m_imageUseProg, TQT_SIGNAL(toggled(bool)), m_imageProg, TQT_SLOT(setEnabled(bool)) ); - connect( m_animationUseProg, TQT_SIGNAL(toggled(bool)), m_animationProg, TQT_SLOT(setEnabled(bool)) ); - connect( m_soundUseProg, TQT_SIGNAL(toggled(bool)), m_soundProg, TQT_SLOT(setEnabled(bool)) ); + connect( m_htmlUseProg, TQ_SIGNAL(toggled(bool)), m_htmlProg, TQ_SLOT(setEnabled(bool)) ); + connect( m_imageUseProg, TQ_SIGNAL(toggled(bool)), m_imageProg, TQ_SLOT(setEnabled(bool)) ); + connect( m_animationUseProg, TQ_SIGNAL(toggled(bool)), m_animationProg, TQ_SLOT(setEnabled(bool)) ); + connect( m_soundUseProg, TQ_SIGNAL(toggled(bool)), m_soundProg, TQ_SLOT(setEnabled(bool)) ); layout->insertStretch(-1); load(); diff --git a/src/softwareimporters.cpp b/src/softwareimporters.cpp index be68e13..07ffc1d 100644 --- a/src/softwareimporters.cpp +++ b/src/softwareimporters.cpp @@ -100,7 +100,7 @@ TextFileImportDialog::TextFileImportDialog(TQWidget *parent) m_choices->setButton(0); topLayout->addWidget(m_choices); - connect( m_customSeparator, TQT_SIGNAL(textChanged()), this, TQT_SLOT(customSeparatorChanged()) ); + connect( m_customSeparator, TQ_SIGNAL(textChanged()), this, TQ_SLOT(customSeparatorChanged()) ); setMainWidget(page); } diff --git a/src/systemtray.cpp b/src/systemtray.cpp index 842608f..2b06ed0 100644 --- a/src/systemtray.cpp +++ b/src/systemtray.cpp @@ -204,10 +204,10 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) setAcceptDrops(true); m_showTimer = new TQTimer(this); - connect( m_showTimer, TQT_SIGNAL(timeout()), Global::bnpView, TQT_SLOT(setActive()) ); + connect( m_showTimer, TQ_SIGNAL(timeout()), Global::bnpView, TQ_SLOT(setActive()) ); m_autoShowTimer = new TQTimer(this); - connect( m_autoShowTimer, TQT_SIGNAL(timeout()), Global::bnpView, TQT_SLOT(setActive()) ); + connect( m_autoShowTimer, TQ_SIGNAL(timeout()), Global::bnpView, TQ_SLOT(setActive()) ); // Create pixmaps for the icon: m_iconPixmap = loadIcon("basket"); @@ -285,7 +285,7 @@ void SystemTray::mousePressEvent(TQMouseEvent *event) } Global::bnpView->currentBasket()->setInsertPopupMenu(); - connect( &menu, TQT_SIGNAL(aboutToHide()), Global::bnpView->currentBasket(), TQT_SLOT(delayedCancelInsertPopupMenu()) ); + connect( &menu, TQ_SIGNAL(aboutToHide()), Global::bnpView->currentBasket(), TQ_SLOT(delayedCancelInsertPopupMenu()) ); menu.exec(event->globalPos()); event->accept(); } else @@ -426,7 +426,7 @@ void SystemTray::updateToolTip() setPixmap(bgPix); } - //TQTimer::singleShot( Container::c_delayTooltipTime, this, TQT_SLOT(updateToolTipDelayed()) ); + //TQTimer::singleShot( Container::c_delayTooltipTime, this, TQ_SLOT(updateToolTipDelayed()) ); // No need to delay: it's be called when notes are changed: updateToolTipDelayed(); } diff --git a/src/tag.cpp b/src/tag.cpp index 73be5f8..db0cbad 100644 --- a/src/tag.cpp +++ b/src/tag.cpp @@ -227,7 +227,7 @@ Tag::Tag() static int tagNumber = 0; ++tagNumber; TQString sAction = "tag_shortcut_number_" + TQString::number(tagNumber); - m_action = new TDEAction("FAKE TEXT", "FAKE ICON", TDEShortcut(), Global::bnpView, TQT_SLOT(activatedTagShortcut()), Global::bnpView->actionCollection(), sAction.utf8()); + m_action = new TDEAction("FAKE TEXT", "FAKE ICON", TDEShortcut(), Global::bnpView, TQ_SLOT(activatedTagShortcut()), Global::bnpView->actionCollection(), sAction.utf8()); m_action->setShortcutConfigurable(false); // We do it in the tag properties dialog m_inheritedBySiblings = false; diff --git a/src/tagsedit.cpp b/src/tagsedit.cpp index ea0f8a6..d8db8dc 100644 --- a/src/tagsedit.cpp +++ b/src/tagsedit.cpp @@ -337,8 +337,8 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew TQPushButton *newTag = new TQPushButton(i18n("Ne&w Tag"), plainPage()); TQPushButton *newState = new TQPushButton(i18n("New St&ate"), plainPage()); - connect( newTag, TQT_SIGNAL(clicked()), this, TQT_SLOT(newTag()) ); - connect( newState, TQT_SIGNAL(clicked()), this, TQT_SLOT(newState()) ); + connect( newTag, TQ_SIGNAL(clicked()), this, TQ_SLOT(newTag()) ); + connect( newState, TQ_SIGNAL(clicked()), this, TQ_SLOT(newState()) ); m_tags = new TagListView(plainPage()); m_tags->header()->hide(); @@ -355,9 +355,9 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew TQToolTip::add( m_moveDown, i18n("Move Down (Ctrl+Shift+Down)") ); TQToolTip::add( m_deleteTag, i18n("Delete") ); - connect( m_moveUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveUp()) ); - connect( m_moveDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveDown()) ); - connect( m_deleteTag, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteTag()) ); + connect( m_moveUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveUp()) ); + connect( m_moveDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveDown()) ); + connect( m_deleteTag, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteTag()) ); TQHBoxLayout *topLeftLayout = new TQHBoxLayout(0, /*margin=*/0, spacingHint()); topLeftLayout->addWidget(m_moveUp); @@ -385,8 +385,8 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew m_shortcut = new KKeyButton(tagWidget); m_removeShortcut = new TQPushButton(i18n("Remove tag shortcut", "&Remove"), tagWidget); TQLabel *shortcutLabel = new TQLabel(m_shortcut, i18n("S&hortcut:"), tagWidget); - connect( m_shortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), this, TQT_SLOT(capturedShortcut(const TDEShortcut&)) ); - connect( m_removeShortcut, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeShortcut()) ); + connect( m_shortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), this, TQ_SLOT(capturedShortcut(const TDEShortcut&)) ); + connect( m_removeShortcut, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeShortcut()) ); m_inherit = new TQCheckBox(i18n("&Inherited by new sibling notes"), tagWidget); @@ -412,7 +412,7 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew m_emblem->setIcon("edit-delete"); m_removeEmblem = new TQPushButton(i18n("Remove tag emblem", "Remo&ve"), emblemWidget); TQLabel *emblemLabel = new TQLabel(m_emblem, i18n("&Emblem:"), stateWidget); - connect( m_removeEmblem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeEmblem()) ); // m_emblem.resetIcon() is not a slot! + connect( m_removeEmblem, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeEmblem()) ); // m_emblem.resetIcon() is not a slot! // Make the icon button and the remove button the same height: int height = TQMAX(m_emblem->sizeHint().width(), m_emblem->sizeHint().height()); @@ -592,25 +592,25 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew } // Connect Signals: - connect( m_tagName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(modified()) ); - connect( m_shortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), this, TQT_SLOT(modified()) ); - connect( m_inherit, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(modified()) ); - connect( m_stateName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(modified()) ); - connect( m_emblem, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(modified()) ); - connect( m_backgroundColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(modified()) ); - connect( m_bold, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(modified()) ); - connect( m_underline, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(modified()) ); - connect( m_italic, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(modified()) ); - connect( m_strike, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(modified()) ); - connect( m_textColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(modified()) ); - connect( m_font, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(modified()) ); - connect( m_fontSize, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(modified()) ); - connect( m_textEquivalent, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(modified()) ); - connect( m_onEveryLines, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(modified()) ); - - connect( m_tags, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(currentItemChanged(TQListViewItem*)) ); - connect( m_tags, TQT_SIGNAL(deletePressed()), this, TQT_SLOT(deleteTag()) ); - connect( m_tags, TQT_SIGNAL(doubleClickedItem()), this, TQT_SLOT(renameIt()) ); + connect( m_tagName, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(modified()) ); + connect( m_shortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), this, TQ_SLOT(modified()) ); + connect( m_inherit, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(modified()) ); + connect( m_stateName, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(modified()) ); + connect( m_emblem, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(modified()) ); + connect( m_backgroundColor, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(modified()) ); + connect( m_bold, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(modified()) ); + connect( m_underline, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(modified()) ); + connect( m_italic, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(modified()) ); + connect( m_strike, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(modified()) ); + connect( m_textColor, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(modified()) ); + connect( m_font, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(modified()) ); + connect( m_fontSize, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(modified()) ); + connect( m_textEquivalent, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(modified()) ); + connect( m_onEveryLines, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(modified()) ); + + connect( m_tags, TQ_SIGNAL(currentChanged(TQListViewItem*)), this, TQ_SLOT(currentItemChanged(TQListViewItem*)) ); + connect( m_tags, TQ_SIGNAL(deletePressed()), this, TQ_SLOT(deleteTag()) ); + connect( m_tags, TQ_SIGNAL(doubleClickedItem()), this, TQ_SLOT(renameIt()) ); TQListViewItem *firstItem = m_tags->firstChild(); if (stateToEdit != 0) { @@ -641,31 +641,31 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew // Some keyboard shortcuts: // Ctrl+arrows instead of Alt+arrows (same as Go menu in the main window) because Alt+Down is for combo boxes TQAction *selectAbove = new TQAction(this); selectAbove->setAccel(TQString("Ctrl+Up")); - connect( selectAbove, TQT_SIGNAL(activated()), this, TQT_SLOT(selectUp()) ); + connect( selectAbove, TQ_SIGNAL(activated()), this, TQ_SLOT(selectUp()) ); TQAction *selectBelow = new TQAction(this); selectBelow->setAccel(TQString("Ctrl+Down")); - connect( selectBelow, TQT_SIGNAL(activated()), this, TQT_SLOT(selectDown()) ); + connect( selectBelow, TQ_SIGNAL(activated()), this, TQ_SLOT(selectDown()) ); TQAction *selectLeft = new TQAction(this); selectLeft->setAccel(TQString("Ctrl+Left")); - connect( selectLeft, TQT_SIGNAL(activated()), this, TQT_SLOT(selectLeft()) ); + connect( selectLeft, TQ_SIGNAL(activated()), this, TQ_SLOT(selectLeft()) ); TQAction *selectRight = new TQAction(this); selectRight->setAccel(TQString("Ctrl+Right")); - connect( selectRight, TQT_SIGNAL(activated()), this, TQT_SLOT(selectRight()) ); + connect( selectRight, TQ_SIGNAL(activated()), this, TQ_SLOT(selectRight()) ); TQAction *moveAbove = new TQAction(this); moveAbove->setAccel(TQString("Ctrl+Shift+Up")); - connect( moveAbove, TQT_SIGNAL(activated()), this, TQT_SLOT(moveUp()) ); + connect( moveAbove, TQ_SIGNAL(activated()), this, TQ_SLOT(moveUp()) ); TQAction *moveBelow = new TQAction(this); moveBelow->setAccel(TQString("Ctrl+Shift+Down")); - connect( moveBelow, TQT_SIGNAL(activated()), this, TQT_SLOT(moveDown()) ); + connect( moveBelow, TQ_SIGNAL(activated()), this, TQ_SLOT(moveDown()) ); TQAction *rename = new TQAction(this); rename->setAccel(TQString("F2")); - connect( rename, TQT_SIGNAL(activated()), this, TQT_SLOT(renameIt()) ); + connect( rename, TQ_SIGNAL(activated()), this, TQ_SLOT(renameIt()) ); m_tags->setMinimumSize( m_tags->sizeHint().width() * 2, @@ -673,10 +673,10 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew ); if (addNewTag) - TQTimer::singleShot(0, this, TQT_SLOT(newTag()) ); + TQTimer::singleShot(0, this, TQ_SLOT(newTag()) ); else // Once the window initial size is computed and the window show, allow the user to resize it down: - TQTimer::singleShot(0, this, TQT_SLOT(resetTreeSizeHint()) ); + TQTimer::singleShot(0, this, TQ_SLOT(resetTreeSizeHint()) ); } TagsEditDialog::~TagsEditDialog() diff --git a/src/variouswidgets.cpp b/src/variouswidgets.cpp index 3fd2ff4..4e49bba 100644 --- a/src/variouswidgets.cpp +++ b/src/variouswidgets.cpp @@ -51,7 +51,7 @@ RunCommandRequester::RunCommandRequester(const TQString &runCommand, const TQStr layout->addWidget(m_runCommand); layout->addWidget(pb); - connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelCommand()) ); + connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelCommand()) ); } RunCommandRequester::~RunCommandRequester() @@ -154,7 +154,7 @@ HelpLabel::HelpLabel(const TQString &text, const TQString &message, TQWidget *pa : KURLLabel(parent), m_message(message) { setText(text); - connect( this, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(showMessage()) ); + connect( this, TQ_SIGNAL(leftClickedURL()), this, TQ_SLOT(showMessage()) ); } HelpLabel::~HelpLabel() @@ -216,9 +216,9 @@ IconSizeDialog::IconSizeDialog(const TQString &caption, const TQString &message, case 128: iconView->setSelected(m_size128, true); m_iconSize = 128; break; } - connect( iconView, TQT_SIGNAL(executed(TQIconViewItem*)), this, TQT_SLOT(choose(TQIconViewItem*)) ); - connect( iconView, TQT_SIGNAL(returnPressed(TQIconViewItem*)), this, TQT_SLOT(choose(TQIconViewItem*)) ); - connect( iconView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); + connect( iconView, TQ_SIGNAL(executed(TQIconViewItem*)), this, TQ_SLOT(choose(TQIconViewItem*)) ); + connect( iconView, TQ_SIGNAL(returnPressed(TQIconViewItem*)), this, TQ_SLOT(choose(TQIconViewItem*)) ); + connect( iconView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) ); setMainWidget(page); } @@ -273,8 +273,8 @@ FontSizeCombo::FontSizeCombo(bool rw, bool withDefault, TQWidget *parent, const for (TQValueList<int>::Iterator it = sizes.begin(); it != sizes.end(); ++it) insertItem(TQString::number(*it)); -// connect( this, TQT_SIGNAL(acivated(const TQString&)), this, TQT_SLOT(textChangedInCombo(const TQString&)) ); - connect( this, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChangedInCombo(const TQString&)) ); +// connect( this, TQ_SIGNAL(acivated(const TQString&)), this, TQ_SLOT(textChangedInCombo(const TQString&)) ); + connect( this, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(textChangedInCombo(const TQString&)) ); // TODO: 01617 void TDEFontSizeAction::setFontSize( int size ) } |