TDE
/
basket
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/basket
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace Qt with TQt

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/17/head
Michele Calgaro 6 months ago
parent 5665df9602
commit ac30f16b60
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
11 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File

8
src/backup.cpp
Unescape View File

@ -68,7 +68,7 @@ BackupDialog::BackupDialog(TQWidget *parent, const char *name)
TQString savesFolder = Global::savesFolder();
savesFolder = savesFolder.left(savesFolder.length() - 1); // savesFolder ends with "/"
TQGroupBox *folderGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Save Folder"), page);
TQGroupBox *folderGroup = new TQGroupBox(1, TQt::Horizontal, i18n("Save Folder"), page);
new TQLabel("<qt><nobr>" + i18n("Your baskets are currently stored in that folder:<br><b>%1</b>").arg(savesFolder), folderGroup);
TQWidget *folderWidget = new TQWidget(folderGroup);
TQHBoxLayout *folderLayout = new TQHBoxLayout(folderWidget, 0, spacingHint());
@ -92,7 +92,7 @@ BackupDialog::BackupDialog(TQWidget *parent, const char *name)
connect( moveFolder, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveToAnotherFolder()) );
connect( useFolder, TQT_SIGNAL(clicked()), this, TQT_SLOT(useAnotherExistingFolder()) );
TQGroupBox *backupGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Backups"), page);
TQGroupBox *backupGroup = new TQGroupBox(1, TQt::Horizontal, i18n("Backups"), page);
TQWidget *backupWidget = new TQWidget(backupGroup);
TQHBoxLayout *backupLayout = new TQHBoxLayout(backupWidget, 0, spacingHint());
TQPushButton *backupButton = new TQPushButton(i18n("&Backup..."), backupWidget);
@ -118,7 +118,7 @@ void BackupDialog::populateLastBackup()
{
TQString lastBackupText = i18n("Last backup: never");
if (Settings::lastBackup().isValid())
lastBackupText = i18n("Last backup: %1").arg(Settings::lastBackup().toString(Qt::LocalDate));
lastBackupText = i18n("Last backup: %1").arg(Settings::lastBackup().toString(TQt::LocalDate));
m_lastBackup->setText(lastBackupText);
}
@ -174,7 +174,7 @@ void BackupDialog::backup()
config->setGroup("Backups");
TQString folder = config->readEntry("lastFolder", TQDir::homeDirPath()) + "/";
TQString fileName = i18n("Backup filename (without extension), %1 is the date", "Baskets_%1")
.arg(TQDate::currentDate().toString(Qt::ISODate));
.arg(TQDate::currentDate().toString(TQt::ISODate));
TQString url = folder + fileName;
// Ask a file name & path to the user:

46
src/basket.cpp
Unescape View File

@ -728,9 +728,9 @@ void Basket::loadNotes(const TQDomElement &notes, Note *parent)
appendNoteIn(note, parent); // ... And insert it.
// Load dates:
if (e.hasAttribute("added"))
note->setAddedDate( TQDateTime::fromString(e.attribute("added"), Qt::ISODate));
note->setAddedDate( TQDateTime::fromString(e.attribute("added"), TQt::ISODate));
if (e.hasAttribute("lastModification"))
note->setLastModificationDate(TQDateTime::fromString(e.attribute("lastModification"), Qt::ISODate));
note->setLastModificationDate(TQDateTime::fromString(e.attribute("lastModification"), TQt::ISODate));
}
// If we successfully loaded a note:
if (note) {
@ -783,8 +783,8 @@ void Basket::saveNotes(TQDomDocument &document, TQDomElement &element, Note *par
// Save Content:
if (note->content()) {
// Save Dates:
noteElement.setAttribute("added", note->addedDate().toString(Qt::ISODate) );
noteElement.setAttribute("lastModification", note->lastModificationDate().toString(Qt::ISODate));
noteElement.setAttribute("added", note->addedDate().toString(TQt::ISODate) );
noteElement.setAttribute("lastModification", note->lastModificationDate().toString(TQt::ISODate));
// Save Content:
noteElement.setAttribute("type", note->content()->lowerTypeName());
TQDomElement content = document.createElement("content");
@ -1451,12 +1451,12 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
// Do nothing if we disabled the click some milliseconds sooner.
// For instance when a popup menu has been closed with click, we should not do action:
if (event->button() == Qt::LeftButton && (kapp->activePopupWidget() || m_lastDisableClick.msecsTo(TQTime::currentTime()) <= 80)) {
if (event->button() == TQt::LeftButton && (kapp->activePopupWidget() || m_lastDisableClick.msecsTo(TQTime::currentTime()) <= 80)) {
doHoverEffects();
m_noActionOnMouseRelease = true;
// But we allow to select:
// The code is the same as at the bottom of this method:
if (event->button() == Qt::LeftButton) {
if (event->button() == TQt::LeftButton) {
m_selectionStarted = true;
m_selectionBeginPoint = event->pos();
m_selectionInvert = controlPressed || shiftPressed;
@ -1469,7 +1469,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
Note::Zone zone = (clicked ? clicked->zoneAt( event->pos() - TQPoint(clicked->x(), clicked->y()) ) : Note::None);
// Popup Tags menu:
if (zone == Note::TagsArrow && !controlPressed && !shiftPressed && event->button() != Qt::MidButton) {
if (zone == Note::TagsArrow && !controlPressed && !shiftPressed && event->button() != TQt::MidButton) {
if (!clicked->isSelected())
unselectAllBut(clicked);
setFocusedNote(clicked); /// /// ///
@ -1479,7 +1479,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
return;
}
if (event->button() == Qt::LeftButton) {
if (event->button() == TQt::LeftButton) {
// Prepare to allow drag and drop when moving mouse further:
if ( (zone == Note::Handle || zone == Note::Group) ||
(clicked && clicked->isSelected() &&
@ -1564,7 +1564,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
}
// Popup menu for tag emblems:
if (event->button() == Qt::RightButton && zone >= Note::Emblem0) {
if (event->button() == TQt::RightButton && zone >= Note::Emblem0) {
if (!clicked->isSelected())
unselectAllBut(clicked);
setFocusedNote(clicked); /// /// ///
@ -1575,7 +1575,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
}
// Insertion Popup Menu:
if ( (event->button() == Qt::RightButton) &&
if ( (event->button() == TQt::RightButton) &&
((!clicked && isFreeLayout()) ||
(clicked && (zone == Note::TopInsert || zone == Note::TopGroup || zone == Note::BottomInsert || zone == Note::BottomGroup || zone == Note::BottomColumn))) ) {
unselectAll();
@ -1599,7 +1599,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
}
// Note Context Menu:
if (event->button() == Qt::RightButton && clicked && !clicked->isColumn() && zone != Note::Resizer) {
if (event->button() == TQt::RightButton && clicked && !clicked->isColumn() && zone != Note::Resizer) {
if (!clicked->isSelected())
unselectAllBut(clicked);
setFocusedNote(clicked); /// /// ///
@ -1619,7 +1619,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
}
// Paste selection under cursor (but not "create new primary note under cursor" because this is on moveRelease):
if (event->button() == Qt::MidButton && zone != Note::Resizer && (!isDuringEdit() || clicked != editedNote())) {
if (event->button() == TQt::MidButton && zone != Note::Resizer && (!isDuringEdit() || clicked != editedNote())) {
if ((Settings::middleAction() != 0) && (event->state() == TQt::ShiftButton)) {
m_clickedToInsert = clicked;
m_zoneToInsert = zone;
@ -1679,7 +1679,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
* and if it's larger, switching to m_isSelecting mode: we can draw the selection rectangle.
*/
// Prepare selection:
if (event->button() == Qt::LeftButton) {
if (event->button() == TQt::LeftButton) {
m_selectionStarted = true;
m_selectionBeginPoint = event->pos();
// We usualy invert the selection with the Ctrl key, but some environements (like GNOME or The Gimp) do it with the Shift key.
@ -1856,7 +1856,7 @@ void Basket::insertNote(Note *note, Note *clicked, int zone, const TQPoint &pos,
void Basket::clickedToInsert(TQMouseEvent *event, Note *clicked, /*Note::Zone*/int zone)
{
Note *note;
if (event->button() == Qt::MidButton)
if (event->button() == TQt::MidButton)
note = NoteFactory::dropNote(TDEApplication::clipboard()->data(TQClipboard::Selection), this);
else
note = NoteFactory::createNoteText("", this);
@ -1868,7 +1868,7 @@ void Basket::clickedToInsert(TQMouseEvent *event, Note *clicked, /*Note::Zone*/i
// ensureNoteVisible(lastInsertedNote()); // TODO: in insertNote()
if (event->button() != Qt::MidButton) {
if (event->button() != TQt::MidButton) {
removeInserter(); // Case: user clicked below a column to insert, the note is inserted and doHoverEffects() put a new inserter below. We don't want it.
closeEditor();
noteEdit(note, /*justAdded=*/true);
@ -1968,7 +1968,7 @@ void Basket::contentsDropEvent(TQDropEvent *event)
// If moved a note on bottom, contentsHeight has been disminished, then view scrolled up, and we should re-scroll the view down:
ensureNoteVisible(note);
// if (event->button() != Qt::MidButton) {
// if (event->button() != TQt::MidButton) {
// removeInserter(); // Case: user clicked below a column to insert, the note is inserted and doHoverEffects() put a new inserter below. We don't want it.
// }
@ -2228,7 +2228,7 @@ void Basket::contentsMouseReleaseEvent(TQMouseEvent *event)
if (event->button() == Qt::MidButton && zone != Note::Resizer && (!isDuringEdit() || clicked != editedNote())) {
if (event->button() == TQt::MidButton && zone != Note::Resizer && (!isDuringEdit() || clicked != editedNote())) {
if ((Settings::middleAction() != 0) && (event->stateAfter() == TQt::ShiftButton)) {
m_clickedToInsert = clicked;
m_zoneToInsert = zone;
@ -2264,7 +2264,7 @@ void Basket::contentsMouseReleaseEvent(TQMouseEvent *event)
// Note *clicked = noteAt(event->pos().x(), event->pos().y());
if ( ! clicked ) {
if (isFreeLayout() && event->button() == Qt::LeftButton) {
if (isFreeLayout() && event->button() == TQt::LeftButton) {
clickedToInsert(event);
save();
}
@ -2291,7 +2291,7 @@ void Basket::contentsMouseReleaseEvent(TQMouseEvent *event)
// Switch tag states:
if (zone >= Note::Emblem0) {
if (event->button() == Qt::LeftButton) {
if (event->button() == TQt::LeftButton) {
int icons = -1;
for (State::List::iterator it = clicked->states().begin(); it != clicked->states().end(); ++it) {
if ( ! (*it)->emblem().isEmpty() )
@ -2313,7 +2313,7 @@ void Basket::contentsMouseReleaseEvent(TQMouseEvent *event)
}
}
return;
}/* else if (event->button() == Qt::RightButton) {
}/* else if (event->button() == TQt::RightButton) {
popupEmblemMenu(clicked, zone - Note::Emblem0);
return;
}*/
@ -2324,9 +2324,9 @@ void Basket::contentsMouseReleaseEvent(TQMouseEvent *event)
// Note *note;
TQString link;
//int zone = zone;
if (event->button() == Qt::MidButton && zone == Note::Resizer)
if (event->button() == TQt::MidButton && zone == Note::Resizer)
return; //zone = clicked->zoneAt( event->pos() - TQPoint(clicked->x(), clicked->y()), true );
if (event->button() == Qt::RightButton && (clicked->isColumn() || zone == Note::Resizer))
if (event->button() == TQt::RightButton && (clicked->isColumn() || zone == Note::Resizer))
return;
if (clicked->isGroup() && zone == Note::None)
return;
@ -2400,7 +2400,7 @@ void Basket::contentsMouseDoubleClickEvent(TQMouseEvent *event)
Note *clicked = noteAt(event->pos().x(), event->pos().y());
Note::Zone zone = (clicked ? clicked->zoneAt( event->pos() - TQPoint(clicked->x(), clicked->y()) ) : Note::None);
if (event->button() == Qt::LeftButton && (zone == Note::Group || zone == Note::Handle)) {
if (event->button() == TQt::LeftButton && (zone == Note::Group || zone == Note::Handle)) {
doCopy(CopyToSelection);
m_noActionOnMouseRelease = true;
} else

2
src/basketproperties.cpp
Unescape View File

@ -71,7 +71,7 @@ BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, TQWidget *parent)
topLayout->addLayout(nameLayout);
// Appearance:
TQGroupBox *appearance = new TQGroupBox(1, Qt::Horizontal, i18n("Appearance"), page);
TQGroupBox *appearance = new TQGroupBox(1, TQt::Horizontal, i18n("Appearance"), page);
TQWidget *appearanceWidget = new TQWidget(appearance);
TQGridLayout *grid = new TQGridLayout(appearanceWidget, /*nRows=*/3, /*nCols=*/2, /*margin=*/0, spacingHint());
m_backgroundImage = new TQComboBox(appearanceWidget);

4
src/bnpview.cpp
Unescape View File

@ -84,7 +84,7 @@ const int BNPView::c_delayTooltipTime = 275;
BNPView::BNPView(TQWidget *parent, const char *name, KXMLGUIClient *aGUIClient,
TDEActionCollection *actionCollection, BasketStatusBar *bar)
: DCOPObject("BasketIface"), TQSplitter(Qt::Horizontal, parent, name), m_actLockBasket(0), m_actPassBasket(0),
: DCOPObject("BasketIface"), TQSplitter(TQt::Horizontal, parent, name), m_actLockBasket(0), m_actPassBasket(0),
m_loading(true), m_newBasketPopup(false), m_firstShow(true),
m_regionGrabber(0), m_passiveDroppedSelection(0), m_passivePopup(0), m_actionCollection(actionCollection),
m_guiClient(aGUIClient), m_statusbar(bar), m_tryHideTimer(0), m_hideTimer(0)
@ -644,7 +644,7 @@ void BNPView::slotShowProperties(TQListViewItem *item, const TQPoint&, int)
void BNPView::slotMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &/*pos*/, int /*column*/)
{
if (item && (button & Qt::MidButton)) {
if (item && (button & TQt::MidButton)) {
// TODO: Paste into ((BasketListViewItem*)listViewItem)->basket()
}
}

2
src/clickablelabel.cpp
Unescape View File

@ -22,7 +22,7 @@
void ClickableLabel::mousePressEvent(TQMouseEvent *event)
{
if (event->button() & Qt::LeftButton)
if (event->button() & TQt::LeftButton)
emit clicked();
}

4
src/kcolorcombo2.cpp
Unescape View File

@ -706,7 +706,7 @@ void KColorCombo2::mousePressEvent(TQMouseEvent *event)
{
m_dragStartPos = event->pos();
if (event->button() == Qt::LeftButton && m_discardNextMousePress)
if (event->button() == TQt::LeftButton && m_discardNextMousePress)
m_discardNextMousePress = false;
else
TQComboBox::mousePressEvent(event);
@ -714,7 +714,7 @@ void KColorCombo2::mousePressEvent(TQMouseEvent *event)
void KColorCombo2::mouseMoveEvent(TQMouseEvent *event)
{
if( (event->state() & Qt::LeftButton) &&
if( (event->state() & TQt::LeftButton) &&
(event->pos() - m_dragStartPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) {
// Drag color object:
KColorDrag *colorDrag = new KColorDrag(effectiveColor(), this);

6
src/popupmenu.h
Unescape View File

@ -94,11 +94,11 @@ c l a s s P o p u p M e n u T e s t : p u b l i c Q W i d g e t
menu.insertItem("- Shift + right click : execAtRectBottom centered");
menu.insertItem("- Shift + middle click : execAtRectRight centered");
if (event->button() & Qt::LeftButton)
if (event->button() & TQt::LeftButton)
PopupMenu::execAtRectCenter(menu, rect);
else if ((event->button() & Qt::RightButton) && (event->state() & TQt::ShiftButton))
else if ((event->button() & TQt::RightButton) && (event->state() & TQt::ShiftButton))
PopupMenu::execAtRectBottom(menu, rect, true);
else if (event->button() & Qt::RightButton)
else if (event->button() & TQt::RightButton)
PopupMenu::execAtRectBottom(menu, rect);
else if ((event->button() & TQt::MidButton) && (event->state() & TQt::ShiftButton))
PopupMenu::execAtRectRight(menu, rect, true);

2
src/regiongrabber.cpp
Unescape View File

@ -106,7 +106,7 @@ void RegionGrabber::initGrabber()
void RegionGrabber::mousePressEvent( TQMouseEvent *e )
{
if ( e->button() == Qt::LeftButton )
if ( e->button() == TQt::LeftButton )
{
mouseDown = true;
grabRect = TQRect( e->pos(), e->pos() );

8
src/settings.cpp
Unescape View File

@ -405,7 +405,7 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name)
layout->addLayout(hLay);
// System Tray Icon:
TQGroupBox *gbSys = new TQGroupBox(3, Qt::Vertical, i18n("System Tray Icon"), this);
TQGroupBox *gbSys = new TQGroupBox(3, TQt::Vertical, i18n("System Tray Icon"), this);
layout->addWidget(gbSys);
TQVBoxLayout *sysLay = new TQVBoxLayout(KDialogBase::spacingHint());
@ -511,7 +511,7 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name)
// Appearance:
TQGroupBox *appearanceBox = new TQGroupBox(3, Qt::Vertical, i18n("Appearance"), this);
TQGroupBox *appearanceBox = new TQGroupBox(3, TQt::Vertical, i18n("Appearance"), this);
layout->addWidget(appearanceBox);
m_playAnimations = new TQCheckBox(i18n("Ani&mate changes in baskets"), appearanceBox);
@ -525,7 +525,7 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name)
// Behavior:
TQGroupBox *behaviorBox = new TQGroupBox(5, Qt::Vertical, i18n("Behavior"), this);
TQGroupBox *behaviorBox = new TQGroupBox(5, TQt::Vertical, i18n("Behavior"), this);
layout->addWidget(behaviorBox);
m_autoBullet = new TQCheckBox(i18n("&Transform lines starting with * or - to lists in text editors"), behaviorBox);
@ -596,7 +596,7 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name)
// Protection:
TQGroupBox *protectionBox = new TQGroupBox(3, Qt::Vertical, i18n("Password Protection"), this);
TQGroupBox *protectionBox = new TQGroupBox(3, TQt::Vertical, i18n("Password Protection"), this);
layout->addWidget(protectionBox);
widget = new TQWidget(protectionBox);

8
src/systemtray.cpp
Unescape View File

@ -229,18 +229,18 @@ SystemTray::~SystemTray()
void SystemTray::mousePressEvent(TQMouseEvent *event)
{
if (event->button() & Qt::LeftButton) { // Prepare drag
if (event->button() & TQt::LeftButton) { // Prepare drag
m_pressPos = event->globalPos();
m_canDrag = true;
event->accept();
} else if (event->button() & Qt::MidButton) { // Paste
} else if (event->button() & TQt::MidButton) { // Paste
Global::bnpView->currentBasket()->setInsertPopupMenu();
Global::bnpView->currentBasket()->pasteNote(TQClipboard::Selection);
Global::bnpView->currentBasket()->cancelInsertPopupMenu();
if (Settings::usePassivePopup())
Global::bnpView->showPassiveDropped(i18n("Pasted selection to basket <i>%1</i>"));
event->accept();
} else if (event->button() & Qt::RightButton) { // Popup menu
} else if (event->button() & TQt::RightButton) { // Popup menu
TDEPopupMenu menu(this);
menu.insertTitle( SmallIcon("basket"), kapp->aboutData()->programName() );
@ -300,7 +300,7 @@ void SystemTray::mouseMoveEvent(TQMouseEvent *event)
void SystemTray::mouseReleaseEvent(TQMouseEvent *event)
{
m_canDrag = false;
if (event->button() == Qt::LeftButton) // Show / hide main window
if (event->button() == TQt::LeftButton) // Show / hide main window
if ( rect().contains(event->pos()) ) { // Accept only if released in systemTray
toggleActive();
emit showPart();

6
src/tagsedit.cpp
Unescape View File

@ -376,7 +376,7 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
TQWidget *rightWidget = new TQWidget(plainPage());
m_tagBox = new TQGroupBox(1, Qt::Horizontal, i18n("Tag"), rightWidget);
m_tagBox = new TQGroupBox(1, TQt::Horizontal, i18n("Tag"), rightWidget);
TQWidget *tagWidget = new TQWidget(m_tagBox);
m_tagName = new TQLineEdit(tagWidget);
@ -399,7 +399,7 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
tagGrid->addMultiCellWidget(m_inherit, /*fromRow=*/2, /*toRow=*/2, /*fromCol=*/0, /*toCol=*/3);
tagGrid->setColStretch(/*col=*/3, /*stretch=*/255);
m_stateBox = new TQGroupBox(1, Qt::Horizontal, i18n("State"), rightWidget);
m_stateBox = new TQGroupBox(1, TQt::Horizontal, i18n("State"), rightWidget);
TQWidget *stateWidget = new TQWidget(m_stateBox);
m_stateName = new TQLineEdit(stateWidget);
@ -519,7 +519,7 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
textEquivalentGrid->addLayout(onEveryLinesHelpLayout, 1, 2);
textEquivalentGrid->setColStretch(/*col=*/3, /*stretch=*/255);
KSeparator *separator = new KSeparator(Qt::Horizontal, stateWidget);
KSeparator *separator = new KSeparator(TQt::Horizontal, stateWidget);
TQGridLayout *stateGrid = new TQGridLayout(stateWidget, /*rows=*/6, /*cols=*/7, /*border=*/0, /*spacing=*/spacingHint());
stateGrid->addWidget(m_stateNameLabel, 0, 0);

Write Preview
Loading…
Cancel
Save