Replace Qt with TQt

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 1300f2c049)
r14.1.x
Michele Calgaro 1 year ago
parent 7d370fbcf3
commit 56a89d7bba
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -1141,7 +1141,7 @@ fi
if test "$kde_qtver" = "3"; then if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
(void)QStyleFactory::create(TQString::null); (void)QStyleFactory::create(TQString::null);
QCursor c(Qt::WhatsThisCursor); QCursor c(TQt::WhatsThisCursor);
EOF EOF
fi fi
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF

@ -323,7 +323,7 @@ AlbumInfo::List AlbumDB::scanAlbums()
++it; ++it;
info.url = *it; info.url = *it;
++it; ++it;
info.date = TQDate::fromString(*it, Qt::ISODate); info.date = TQDate::fromString(*it, TQt::ISODate);
++it; ++it;
info.caption = *it; info.caption = *it;
++it; ++it;
@ -433,7 +433,7 @@ int AlbumDB::addAlbum(const TQString& url, const TQString& caption,
execSql( TQString("REPLACE INTO Albums (url, date, caption, collection) " execSql( TQString("REPLACE INTO Albums (url, date, caption, collection) "
"VALUES('%1', '%2', '%3', '%4');") "VALUES('%1', '%2', '%3', '%4');")
.arg(escapeString(url), .arg(escapeString(url),
date.toString(Qt::ISODate), date.toString(TQt::ISODate),
escapeString(caption), escapeString(caption),
escapeString(collection))); escapeString(collection)));
@ -458,7 +458,7 @@ void AlbumDB::setAlbumCollection(int albumID, const TQString& collection)
void AlbumDB::setAlbumDate(int albumID, const TQDate& date) void AlbumDB::setAlbumDate(int albumID, const TQDate& date)
{ {
execSql( TQString("UPDATE Albums SET date='%1' WHERE id=%2;") execSql( TQString("UPDATE Albums SET date='%1' WHERE id=%2;")
.arg(date.toString(Qt::ISODate)) .arg(date.toString(TQt::ISODate))
.arg(albumID) ); .arg(albumID) );
} }
@ -766,7 +766,7 @@ TQDateTime AlbumDB::getItemDate(TQ_LLONG imageID)
if (values.isEmpty()) if (values.isEmpty())
return TQDateTime(); return TQDateTime();
else else
return TQDateTime::fromString(values[0], Qt::ISODate); return TQDateTime::fromString(values[0], TQt::ISODate);
} }
TQDateTime AlbumDB::getItemDate(int albumID, const TQString& name) TQDateTime AlbumDB::getItemDate(int albumID, const TQString& name)
@ -782,7 +782,7 @@ TQDateTime AlbumDB::getItemDate(int albumID, const TQString& name)
if (values.isEmpty()) if (values.isEmpty())
return TQDateTime(); return TQDateTime();
else else
return TQDateTime::fromString(values[0], Qt::ISODate); return TQDateTime::fromString(values[0], TQt::ISODate);
} }
TQ_LLONG AlbumDB::getImageId(int albumID, const TQString& name) TQ_LLONG AlbumDB::getImageId(int albumID, const TQString& name)
@ -1027,7 +1027,7 @@ int AlbumDB::getOrCreateAlbumId(const TQString& folder)
execSql( TQString ("INSERT INTO Albums (url, date) " execSql( TQString ("INSERT INTO Albums (url, date) "
"VALUES ('%1','%2')") "VALUES ('%1','%2')")
.arg(escapeString(folder), .arg(escapeString(folder),
TQDateTime::currentDateTime().toString(Qt::ISODate)) ); TQDateTime::currentDateTime().toString(TQt::ISODate)) );
albumID = sqlite3_last_insert_rowid(d->dataBase); albumID = sqlite3_last_insert_rowid(d->dataBase);
} else } else
albumID = values[0].toInt(); albumID = values[0].toInt();
@ -1046,7 +1046,7 @@ TQ_LLONG AlbumDB::addItem(int albumID,
"( caption , datetime, name, dirid ) " "( caption , datetime, name, dirid ) "
" VALUES ('%1','%2','%3',%4) " ) " VALUES ('%1','%2','%3',%4) " )
.arg(escapeString(comment), .arg(escapeString(comment),
datetime.toString(Qt::ISODate), datetime.toString(TQt::ISODate),
escapeString(name), escapeString(name),
TQString::number(albumID)) ); TQString::number(albumID)) );
@ -1278,7 +1278,7 @@ bool AlbumDB::setItemDate(TQ_LLONG imageID,
{ {
execSql ( TQString ("UPDATE Images SET datetime='%1'" execSql ( TQString ("UPDATE Images SET datetime='%1'"
"WHERE id=%2;") "WHERE id=%2;")
.arg(datetime.toString(Qt::ISODate), .arg(datetime.toString(TQt::ISODate),
TQString::number(imageID)) ); TQString::number(imageID)) );
return true; return true;
@ -1289,7 +1289,7 @@ bool AlbumDB::setItemDate(int albumID, const TQString& name,
{ {
execSql ( TQString ("UPDATE Images SET datetime='%1'" execSql ( TQString ("UPDATE Images SET datetime='%1'"
"WHERE dirid=%2 AND name='%3';") "WHERE dirid=%2 AND name='%3';")
.arg(datetime.toString(Qt::ISODate), .arg(datetime.toString(TQt::ISODate),
TQString::number(albumID), TQString::number(albumID),
escapeString(name)) ); escapeString(name)) );
@ -1456,7 +1456,7 @@ TQDate AlbumDB::getAlbumLowestDate(int albumID)
execSql( TQString("SELECT MIN(datetime) FROM Images " execSql( TQString("SELECT MIN(datetime) FROM Images "
"WHERE dirid=%1 GROUP BY dirid") "WHERE dirid=%1 GROUP BY dirid")
.arg( albumID ), &values); .arg( albumID ), &values);
TQDate itemDate = TQDate::fromString( values[0], Qt::ISODate ); TQDate itemDate = TQDate::fromString( values[0], TQt::ISODate );
return itemDate; return itemDate;
} }
@ -1466,7 +1466,7 @@ TQDate AlbumDB::getAlbumHighestDate(int albumID)
execSql( TQString("SELECT MAX(datetime) FROM Images " execSql( TQString("SELECT MAX(datetime) FROM Images "
"WHERE dirid=%1 GROUP BY dirid") "WHERE dirid=%1 GROUP BY dirid")
.arg( albumID ), &values); .arg( albumID ), &values);
TQDate itemDate = TQDate::fromString( values[0], Qt::ISODate ); TQDate itemDate = TQDate::fromString( values[0], TQt::ISODate );
return itemDate; return itemDate;
} }
@ -1482,7 +1482,7 @@ TQDate AlbumDB::getAlbumAverageDate(int albumID)
for (TQStringList::iterator it = values.begin(); it != values.end(); ++it) for (TQStringList::iterator it = values.begin(); it != values.end(); ++it)
{ {
TQDateTime itemDateTime = TQDateTime::fromString( *it, Qt::ISODate ); TQDateTime itemDateTime = TQDateTime::fromString( *it, TQt::ISODate );
if (itemDateTime.isValid()) if (itemDateTime.isValid())
{ {
++amountOfImages; ++amountOfImages;

@ -618,7 +618,7 @@ void AlbumLister::slotData(TDEIO::Job*, const TQByteArray& data)
} }
ImageInfo* info = new ImageInfo(imageID, albumID, name, ImageInfo* info = new ImageInfo(imageID, albumID, name,
TQDateTime::fromString(date, Qt::ISODate), TQDateTime::fromString(date, TQt::ISODate),
size, dims); size, dims);
if (matchesFilter(info, foundText)) if (matchesFilter(info, foundText))

@ -113,7 +113,7 @@ bool CameraList::load()
TQDateTime lastAccess = TQDateTime::currentDateTime(); TQDateTime lastAccess = TQDateTime::currentDateTime();
if (!e.attribute("lastaccess").isEmpty()) if (!e.attribute("lastaccess").isEmpty())
lastAccess = TQDateTime::fromString(e.attribute("lastaccess"), Qt::ISODate); lastAccess = TQDateTime::fromString(e.attribute("lastaccess"), TQt::ISODate);
CameraType *ctype = new CameraType(title, model, port, path, lastAccess); CameraType *ctype = new CameraType(title, model, port, path, lastAccess);
insertPrivate(ctype); insertPrivate(ctype);
@ -141,7 +141,7 @@ bool CameraList::save()
elem.setAttribute("model", ctype->model()); elem.setAttribute("model", ctype->model());
elem.setAttribute("port", ctype->port()); elem.setAttribute("port", ctype->port());
elem.setAttribute("path", ctype->path()); elem.setAttribute("path", ctype->path());
elem.setAttribute("lastaccess", ctype->lastAccess().toString(Qt::ISODate)); elem.setAttribute("lastaccess", ctype->lastAccess().toString(TQt::ISODate));
docElem.appendChild(elem); docElem.appendChild(elem);
} }

@ -925,7 +925,7 @@ void IconView::contentsMousePressEvent(TQMouseEvent* e)
d->rubber = 0; d->rubber = 0;
} }
if (e->button() == Qt::RightButton) if (e->button() == TQt::RightButton)
{ {
IconItem* item = findItem(e->pos()); IconItem* item = findItem(e->pos());
if (item) if (item)
@ -1125,7 +1125,7 @@ void IconView::contentsMouseMoveEvent(TQMouseEvent* e)
d->toolTipTimer->stop(); d->toolTipTimer->stop();
slotToolTip(); slotToolTip();
if (d->dragging && (e->state() & Qt::LeftButton)) if (d->dragging && (e->state() & TQt::LeftButton))
{ {
if ( (d->dragStartPos - e->pos()).manhattanLength() if ( (d->dragStartPos - e->pos()).manhattanLength()
> TQApplication::startDragDistance() ) > TQApplication::startDragDistance() )
@ -1240,7 +1240,7 @@ void IconView::contentsMouseReleaseEvent(TQMouseEvent* e)
d->rubber = 0; d->rubber = 0;
} }
if (e->state() == Qt::LeftButton) if (e->state() == TQt::LeftButton)
{ {
if (d->pressedMoved) if (d->pressedMoved)
{ {

@ -320,7 +320,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event )
void KDateEdit::mousePressEvent( TQMouseEvent *event ) void KDateEdit::mousePressEvent( TQMouseEvent *event )
{ {
if ( event->button() == Qt::LeftButton && mDiscardNextMousePress ) { if ( event->button() == TQt::LeftButton && mDiscardNextMousePress ) {
mDiscardNextMousePress = false; mDiscardNextMousePress = false;
return; return;
} }

@ -132,7 +132,7 @@ void RatingFilter::mousePressEvent(TQMouseEvent* e)
d->dirty = false; d->dirty = false;
if ( e->button() == Qt::LeftButton || e->button() == Qt::MidButton ) if ( e->button() == TQt::LeftButton || e->button() == TQt::MidButton )
{ {
d->dirty = true; d->dirty = true;
int pos = e->x() / regPixmapWidth() +1; int pos = e->x() / regPixmapWidth() +1;
@ -143,7 +143,7 @@ void RatingFilter::mousePressEvent(TQMouseEvent* e)
setRating(pos); setRating(pos);
updateRatingTooltip(); updateRatingTooltip();
} }
else if (e->button() == Qt::RightButton) else if (e->button() == TQt::RightButton)
{ {
// Show pop-up menu about Rating Filter condition settings // Show pop-up menu about Rating Filter condition settings

@ -123,7 +123,7 @@ void ScanLib::startScan()
deleteStaleEntries(); deleteStaleEntries();
AlbumDB* db = AlbumManager::instance()->albumDB(); AlbumDB* db = AlbumManager::instance()->albumDB();
db->setSetting("Scanned", TQDateTime::currentDateTime().toString(Qt::ISODate)); db->setSetting("Scanned", TQDateTime::currentDateTime().toString(TQt::ISODate));
} }
void ScanLib::findFoldersWhichDoNotExist() void ScanLib::findFoldersWhichDoNotExist()

@ -134,7 +134,7 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url)
TQWhatsThis::add(groupbox1, i18n("<p>You can edit the search rules " TQWhatsThis::add(groupbox1, i18n("<p>You can edit the search rules "
"by adding/removing criteria.")); "by adding/removing criteria."));
groupbox1->setColumnLayout(0, Qt::Vertical ); groupbox1->setColumnLayout(0, TQt::Vertical );
groupbox1->layout()->setSpacing( KDialog::spacingHint() ); groupbox1->layout()->setSpacing( KDialog::spacingHint() );
groupbox1->layout()->setMargin( KDialog::marginHint() ); groupbox1->layout()->setMargin( KDialog::marginHint() );
d->optionsCombo = new TQComboBox(groupbox1); d->optionsCombo = new TQComboBox(groupbox1);
@ -159,7 +159,7 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url)
TQGroupBox *groupbox2 = new TQGroupBox( i18n("Group/Ungroup Options"), page, "groupbox2" ); TQGroupBox *groupbox2 = new TQGroupBox( i18n("Group/Ungroup Options"), page, "groupbox2" );
TQWhatsThis::add(groupbox1, i18n("<p>You can group or ungroup any search criteria " TQWhatsThis::add(groupbox1, i18n("<p>You can group or ungroup any search criteria "
"from the Search Rule set.")); "from the Search Rule set."));
groupbox2->setColumnLayout(0, Qt::Vertical); groupbox2->setColumnLayout(0, TQt::Vertical);
groupbox2->layout()->setSpacing( KDialog::spacingHint() ); groupbox2->layout()->setSpacing( KDialog::spacingHint() );
groupbox2->layout()->setMargin( KDialog::marginHint() ); groupbox2->layout()->setMargin( KDialog::marginHint() );
d->groupButton = new TQPushButton(i18n("&Group"), groupbox2); d->groupButton = new TQPushButton(i18n("&Group"), groupbox2);
@ -174,7 +174,7 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url)
// box for saving the search. // box for saving the search.
TQGroupBox *groupbox3 = new TQGroupBox( page, "groupbox3"); TQGroupBox *groupbox3 = new TQGroupBox( page, "groupbox3");
groupbox3->setColumnLayout(0, Qt::Vertical ); groupbox3->setColumnLayout(0, TQt::Vertical );
groupbox3->layout()->setSpacing( KDialog::spacingHint() ); groupbox3->layout()->setSpacing( KDialog::spacingHint() );
groupbox3->setFrameStyle( TQFrame::NoFrame ); groupbox3->setFrameStyle( TQFrame::NoFrame );
TQLabel* label = new TQLabel(i18n("&Save search as: "), groupbox3); TQLabel* label = new TQLabel(i18n("&Save search as: "), groupbox3);

@ -217,7 +217,7 @@ void SearchAdvancedRule::setValues(const KURL& url)
m_lineEdit->setText( value ); m_lineEdit->setText( value );
if (m_widgetType == DATE) if (m_widgetType == DATE)
m_dateEdit->setDate( TQDate::fromString( value, Qt::ISODate) ); m_dateEdit->setDate( TQDate::fromString( value, TQt::ISODate) );
if (m_widgetType == RATING) if (m_widgetType == RATING)
{ {
@ -448,7 +448,7 @@ TQString SearchAdvancedRule::urlValue() const
string = m_lineEdit->text() ; string = m_lineEdit->text() ;
else if (m_widgetType == DATE) else if (m_widgetType == DATE)
string = m_dateEdit->date().toString(Qt::ISODate) ; string = m_dateEdit->date().toString(TQt::ISODate) ;
else if (m_widgetType == TAGS || m_widgetType == ALBUMS) else if (m_widgetType == TAGS || m_widgetType == ALBUMS)
string = TQString::number(m_itemsIndexIDMap[ m_valueCombo->currentItem() ]); string = TQString::number(m_itemsIndexIDMap[ m_valueCombo->currentItem() ]);

@ -179,7 +179,7 @@ TimeLineView::TimeLineView(TQWidget *parent)
d->timeLineWidget = new TimeLineWidget(panel); d->timeLineWidget = new TimeLineWidget(panel);
d->scrollBar = new TQScrollBar(panel); d->scrollBar = new TQScrollBar(panel);
d->scrollBar->setOrientation(Qt::Horizontal); d->scrollBar->setOrientation(TQt::Horizontal);
d->scrollBar->setMinValue(0); d->scrollBar->setMinValue(0);
d->scrollBar->setLineStep(1); d->scrollBar->setLineStep(1);
@ -469,10 +469,10 @@ void TimeLineView::createNewDateSearchAlbum(const TQString& name)
end = (*it).second; end = (*it).second;
url.addQueryItem(TQString("%1.key").arg(i*2+1), TQString("imagedate")); url.addQueryItem(TQString("%1.key").arg(i*2+1), TQString("imagedate"));
url.addQueryItem(TQString("%1.op").arg(i*2+1), TQString("GT")); url.addQueryItem(TQString("%1.op").arg(i*2+1), TQString("GT"));
url.addQueryItem(TQString("%1.val").arg(i*2+1), start.date().toString(Qt::ISODate)); url.addQueryItem(TQString("%1.val").arg(i*2+1), start.date().toString(TQt::ISODate));
url.addQueryItem(TQString("%1.key").arg(i*2+2), TQString("imagedate")); url.addQueryItem(TQString("%1.key").arg(i*2+2), TQString("imagedate"));
url.addQueryItem(TQString("%1.op").arg(i*2+2), TQString("LT")); url.addQueryItem(TQString("%1.op").arg(i*2+2), TQString("LT"));
url.addQueryItem(TQString("%1.val").arg(i*2+2), end.date().toString(Qt::ISODate)); url.addQueryItem(TQString("%1.val").arg(i*2+2), end.date().toString(TQt::ISODate));
i++; i++;
} }
@ -529,14 +529,14 @@ void TimeLineView::slotAlbumSelected(SAlbum* salbum)
key = TQString("%1.val").arg(TQString::number(i)); key = TQString("%1.val").arg(TQString::number(i));
it2 = queries.find(key); it2 = queries.find(key);
if (it2 != queries.end()) if (it2 != queries.end())
start = TQDateTime(TQDate::fromString(it2.data(), Qt::ISODate)); start = TQDateTime(TQDate::fromString(it2.data(), TQt::ISODate));
//DDebug() << key << " :: " << it2.data() << endl; //DDebug() << key << " :: " << it2.data() << endl;
key = TQString("%1.val").arg(TQString::number(i+1)); key = TQString("%1.val").arg(TQString::number(i+1));
it2 = queries.find(key); it2 = queries.find(key);
if (it2 != queries.end()) if (it2 != queries.end())
end = TQDateTime(TQDate::fromString(it2.data(), Qt::ISODate)); end = TQDateTime(TQDate::fromString(it2.data(), TQt::ISODate));
//DDebug() << key << " :: " << it2.data() << endl; //DDebug() << key << " :: " << it2.data() << endl;
@ -546,8 +546,8 @@ void TimeLineView::slotAlbumSelected(SAlbum* salbum)
/* /*
DateRangeList::iterator it3; DateRangeList::iterator it3;
for (it3 = list.begin() ; it3 != list.end(); ++it3) for (it3 = list.begin() ; it3 != list.end(); ++it3)
DDebug() << (*it3).first.date().toString(Qt::ISODate) << " :: " DDebug() << (*it3).first.date().toString(TQt::ISODate) << " :: "
<< (*it3).second.date().toString(Qt::ISODate) << endl; << (*it3).second.date().toString(TQt::ISODate) << endl;
*/ */
d->timeLineWidget->setSelectedDateRange(list); d->timeLineWidget->setSelectedDateRange(list);

@ -421,8 +421,8 @@ DateRangeList TimeLineWidget::selectedDateRange(int& totalCount)
/* /*
for (it = list.begin() ; it != list.end(); ++it) for (it = list.begin() ; it != list.end(); ++it)
DDebug() << (*it).first.date().toString(Qt::ISODate) << " :: " DDebug() << (*it).first.date().toString(TQt::ISODate) << " :: "
<< (*it).second.date().toString(Qt::ISODate) << endl; << (*it).second.date().toString(TQt::ISODate) << endl;
DDebug() << "Total Count of Items = " << totalCount << endl; DDebug() << "Total Count of Items = " << totalCount << endl;
*/ */
@ -461,8 +461,8 @@ DateRangeList TimeLineWidget::selectedDateRange(int& totalCount)
/* /*
for (it = list2.begin() ; it != list2.end(); ++it) for (it = list2.begin() ; it != list2.end(); ++it)
DDebug() << (*it).first.date().toString(Qt::ISODate) << " :: " DDebug() << (*it).first.date().toString(TQt::ISODate) << " :: "
<< (*it).second.date().toString(Qt::ISODate) << endl; << (*it).second.date().toString(TQt::ISODate) << endl;
*/ */
return list2; return list2;
@ -1492,7 +1492,7 @@ void TimeLineWidget::wheelEvent(TQWheelEvent* e)
void TimeLineWidget::mousePressEvent(TQMouseEvent *e) void TimeLineWidget::mousePressEvent(TQMouseEvent *e)
{ {
if (e->button() == Qt::LeftButton) if (e->button() == TQt::LeftButton)
{ {
TQPoint pt(e->x(), e->y()); TQPoint pt(e->x(), e->y());

@ -292,7 +292,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
TQGridLayout *firstPageLayout = new TQGridLayout(inProfiles, 4, 2); TQGridLayout *firstPageLayout = new TQGridLayout(inProfiles, 4, 2);
m_inProfileBG = new TQButtonGroup(4, Qt::Vertical, inProfiles); m_inProfileBG = new TQButtonGroup(4, TQt::Vertical, inProfiles);
m_inProfileBG->setFrameStyle(TQFrame::NoFrame); m_inProfileBG->setFrameStyle(TQFrame::NoFrame);
m_inProfileBG->setInsideMargin(0); m_inProfileBG->setInsideMargin(0);
@ -318,7 +318,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
TQPushButton *inProfilesInfo = new TQPushButton(i18n("Info..."), inProfiles); TQPushButton *inProfilesInfo = new TQPushButton(i18n("Info..."), inProfiles);
TQGroupBox *pictureInfo = new TQGroupBox(2, Qt::Horizontal, i18n("Camera information"), inProfiles); TQGroupBox *pictureInfo = new TQGroupBox(2, TQt::Horizontal, i18n("Camera information"), inProfiles);
new TQLabel(i18n("Make:"), pictureInfo); new TQLabel(i18n("Make:"), pictureInfo);
KSqueezedTextLabel *make = new KSqueezedTextLabel(0, pictureInfo); KSqueezedTextLabel *make = new KSqueezedTextLabel(0, pictureInfo);
new TQLabel(i18n("Model:"), pictureInfo); new TQLabel(i18n("Model:"), pictureInfo);
@ -342,7 +342,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
TQGridLayout *secondPageLayout = new TQGridLayout(spaceProfiles, 3, 2); TQGridLayout *secondPageLayout = new TQGridLayout(spaceProfiles, 3, 2);
m_spaceProfileBG = new TQButtonGroup(2, Qt::Vertical, spaceProfiles); m_spaceProfileBG = new TQButtonGroup(2, TQt::Vertical, spaceProfiles);
m_spaceProfileBG->setFrameStyle(TQFrame::NoFrame); m_spaceProfileBG->setFrameStyle(TQFrame::NoFrame);
m_spaceProfileBG->setInsideMargin(0); m_spaceProfileBG->setInsideMargin(0);
@ -376,7 +376,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
TQGridLayout *thirdPageLayout = new TQGridLayout(proofProfiles, 3, 2); TQGridLayout *thirdPageLayout = new TQGridLayout(proofProfiles, 3, 2);
m_proofProfileBG = new TQButtonGroup(2, Qt::Vertical, proofProfiles); m_proofProfileBG = new TQButtonGroup(2, TQt::Vertical, proofProfiles);
m_proofProfileBG->setFrameStyle(TQFrame::NoFrame); m_proofProfileBG->setFrameStyle(TQFrame::NoFrame);
m_proofProfileBG->setInsideMargin(0); m_proofProfileBG->setInsideMargin(0);

@ -278,7 +278,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
TQGridLayout *firstPageLayout = new TQGridLayout(inProfiles, 4, 2, spacingHint()); TQGridLayout *firstPageLayout = new TQGridLayout(inProfiles, 4, 2, spacingHint());
m_inProfileBG = new TQButtonGroup(4, Qt::Vertical, inProfiles); m_inProfileBG = new TQButtonGroup(4, TQt::Vertical, inProfiles);
m_inProfileBG->setFrameStyle(TQFrame::NoFrame); m_inProfileBG->setFrameStyle(TQFrame::NoFrame);
m_inProfileBG->setInsideMargin(0); m_inProfileBG->setInsideMargin(0);
@ -304,7 +304,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
TQPushButton *inProfilesInfo = new TQPushButton(i18n("Info..."), inProfiles); TQPushButton *inProfilesInfo = new TQPushButton(i18n("Info..."), inProfiles);
TQGroupBox *pictureInfo = new TQGroupBox(2, Qt::Horizontal, i18n("Camera information"), inProfiles); TQGroupBox *pictureInfo = new TQGroupBox(2, TQt::Horizontal, i18n("Camera information"), inProfiles);
new TQLabel(i18n("Make:"), pictureInfo); new TQLabel(i18n("Make:"), pictureInfo);
KSqueezedTextLabel *make = new KSqueezedTextLabel(0, pictureInfo); KSqueezedTextLabel *make = new KSqueezedTextLabel(0, pictureInfo);
new TQLabel(i18n("Model:"), pictureInfo); new TQLabel(i18n("Model:"), pictureInfo);
@ -328,7 +328,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
TQGridLayout *secondPageLayout = new TQGridLayout(spaceProfiles, 3, 2, spacingHint()); TQGridLayout *secondPageLayout = new TQGridLayout(spaceProfiles, 3, 2, spacingHint());
m_spaceProfileBG = new TQButtonGroup(2, Qt::Vertical, spaceProfiles); m_spaceProfileBG = new TQButtonGroup(2, TQt::Vertical, spaceProfiles);
m_spaceProfileBG->setFrameStyle(TQFrame::NoFrame); m_spaceProfileBG->setFrameStyle(TQFrame::NoFrame);
m_spaceProfileBG->setInsideMargin(0); m_spaceProfileBG->setInsideMargin(0);
@ -363,7 +363,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
TQGridLayout *thirdPageLayout = new TQGridLayout(proofProfiles, 3, 2, TQGridLayout *thirdPageLayout = new TQGridLayout(proofProfiles, 3, 2,
spacingHint(), spacingHint()); spacingHint(), spacingHint());
m_proofProfileBG = new TQButtonGroup(2, Qt::Vertical, proofProfiles); m_proofProfileBG = new TQButtonGroup(2, TQt::Vertical, proofProfiles);
m_proofProfileBG->setFrameStyle(TQFrame::NoFrame); m_proofProfileBG->setFrameStyle(TQFrame::NoFrame);
m_proofProfileBG->setInsideMargin(0); m_proofProfileBG->setInsideMargin(0);

@ -148,7 +148,7 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent)
TQLabel *labelLeft = new TQLabel(i18n("Cyan"), gboxSettings); TQLabel *labelLeft = new TQLabel(i18n("Cyan"), gboxSettings);
labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_rSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_rSlider"); m_rSlider = new TQSlider(-100, 100, 1, 0, TQt::Horizontal, gboxSettings, "m_rSlider");
m_rSlider->setTickmarks(TQSlider::Below); m_rSlider->setTickmarks(TQSlider::Below);
m_rSlider->setTickInterval(20); m_rSlider->setTickInterval(20);
TQWhatsThis::add( m_rSlider, i18n("<p>Set here the cyan/red color adjustment of the image.")); TQWhatsThis::add( m_rSlider, i18n("<p>Set here the cyan/red color adjustment of the image."));
@ -165,7 +165,7 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent)
labelLeft = new TQLabel(i18n("Magenta"), gboxSettings); labelLeft = new TQLabel(i18n("Magenta"), gboxSettings);
labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_gSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_gSlider"); m_gSlider = new TQSlider(-100, 100, 1, 0, TQt::Horizontal, gboxSettings, "m_gSlider");
m_gSlider->setTickmarks(TQSlider::Below); m_gSlider->setTickmarks(TQSlider::Below);
m_gSlider->setTickInterval(20); m_gSlider->setTickInterval(20);
TQWhatsThis::add( m_gSlider, i18n("<p>Set here the magenta/green color adjustment of the image.")); TQWhatsThis::add( m_gSlider, i18n("<p>Set here the magenta/green color adjustment of the image."));
@ -182,7 +182,7 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent)
labelLeft = new TQLabel(i18n("Yellow"), gboxSettings); labelLeft = new TQLabel(i18n("Yellow"), gboxSettings);
labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_bSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_bSlider"); m_bSlider = new TQSlider(-100, 100, 1, 0, TQt::Horizontal, gboxSettings, "m_bSlider");
m_bSlider->setTickmarks(TQSlider::Below); m_bSlider->setTickmarks(TQSlider::Below);
m_bSlider->setTickInterval(20); m_bSlider->setTickInterval(20);
TQWhatsThis::add( m_bSlider, i18n("<p>Set here the yellow/blue color adjustment of the image.")); TQWhatsThis::add( m_bSlider, i18n("<p>Set here the yellow/blue color adjustment of the image."));

@ -1241,7 +1241,7 @@ void ImageSelectionWidget::placeSelection(TQPoint pm, bool symmetric, TQPoint ce
void ImageSelectionWidget::mousePressEvent ( TQMouseEvent * e ) void ImageSelectionWidget::mousePressEvent ( TQMouseEvent * e )
{ {
if ( e->button() == Qt::LeftButton ) if ( e->button() == TQt::LeftButton )
{ {
TQPoint pm = TQPoint(e->x(), e->y()); TQPoint pm = TQPoint(e->x(), e->y());
TQPoint pmVirtual = convertPoint(pm); TQPoint pmVirtual = convertPoint(pm);
@ -1331,7 +1331,7 @@ void ImageSelectionWidget::mouseReleaseEvent ( TQMouseEvent * )
void ImageSelectionWidget::mouseMoveEvent ( TQMouseEvent * e ) void ImageSelectionWidget::mouseMoveEvent ( TQMouseEvent * e )
{ {
if ( ( e->state() & Qt::LeftButton ) == Qt::LeftButton ) if ( ( e->state() & TQt::LeftButton ) == TQt::LeftButton )
{ {
if ( d->moving ) if ( d->moving )
{ {

@ -161,7 +161,7 @@ RGBTool::RGBTool(TQObject* parent)
TQLabel *labelLeft = new TQLabel(i18n("Cyan"), m_gboxSettings->plainPage()); TQLabel *labelLeft = new TQLabel(i18n("Cyan"), m_gboxSettings->plainPage());
labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_rSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_rSlider"); m_rSlider = new TQSlider(-100, 100, 1, 0, TQt::Horizontal, m_gboxSettings->plainPage(), "m_rSlider");
m_rSlider->setTickmarks(TQSlider::Below); m_rSlider->setTickmarks(TQSlider::Below);
m_rSlider->setTickInterval(20); m_rSlider->setTickInterval(20);
TQWhatsThis::add( m_rSlider, i18n("<p>Set here the cyan/red color adjustment of the image.")); TQWhatsThis::add( m_rSlider, i18n("<p>Set here the cyan/red color adjustment of the image."));
@ -180,7 +180,7 @@ RGBTool::RGBTool(TQObject* parent)
labelLeft = new TQLabel(i18n("Magenta"), m_gboxSettings->plainPage()); labelLeft = new TQLabel(i18n("Magenta"), m_gboxSettings->plainPage());
labelLeft->setAlignment(TQt::AlignRight | TQt::AlignVCenter); labelLeft->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
m_gSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_gSlider"); m_gSlider = new TQSlider(-100, 100, 1, 0, TQt::Horizontal, m_gboxSettings->plainPage(), "m_gSlider");
m_gSlider->setTickmarks(TQSlider::Below); m_gSlider->setTickmarks(TQSlider::Below);
m_gSlider->setTickInterval(20); m_gSlider->setTickInterval(20);
TQWhatsThis::add( m_gSlider, i18n("<p>Set here the magenta/green color adjustment of the image.")); TQWhatsThis::add( m_gSlider, i18n("<p>Set here the magenta/green color adjustment of the image."));
@ -199,7 +199,7 @@ RGBTool::RGBTool(TQObject* parent)
labelLeft = new TQLabel(i18n("Yellow"), m_gboxSettings->plainPage()); labelLeft = new TQLabel(i18n("Yellow"), m_gboxSettings->plainPage());
labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_bSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_bSlider"); m_bSlider = new TQSlider(-100, 100, 1, 0, TQt::Horizontal, m_gboxSettings->plainPage(), "m_bSlider");
m_bSlider->setTickmarks(TQSlider::Below); m_bSlider->setTickmarks(TQSlider::Below);
m_bSlider->setTickInterval(20); m_bSlider->setTickInterval(20);
TQWhatsThis::add( m_bSlider, i18n("<p>Set here the yellow/blue color adjustment of the image.")); TQWhatsThis::add( m_bSlider, i18n("<p>Set here the yellow/blue color adjustment of the image."));

@ -76,7 +76,7 @@ FilmGrainTool::FilmGrainTool(TQObject* parent)
TQGridLayout* grid = new TQGridLayout( m_gboxSettings->plainPage(), 2, 1); TQGridLayout* grid = new TQGridLayout( m_gboxSettings->plainPage(), 2, 1);
TQLabel *label1 = new TQLabel(i18n("Sensitivity (ISO):"), m_gboxSettings->plainPage()); TQLabel *label1 = new TQLabel(i18n("Sensitivity (ISO):"), m_gboxSettings->plainPage());
m_sensibilitySlider = new TQSlider(2, 30, 1, 12, Qt::Horizontal, m_gboxSettings->plainPage()); m_sensibilitySlider = new TQSlider(2, 30, 1, 12, TQt::Horizontal, m_gboxSettings->plainPage());
m_sensibilitySlider->setTracking(false); m_sensibilitySlider->setTracking(false);
m_sensibilitySlider->setTickInterval(1); m_sensibilitySlider->setTickInterval(1);
m_sensibilitySlider->setTickmarks(TQSlider::Below); m_sensibilitySlider->setTickmarks(TQSlider::Below);

@ -87,7 +87,7 @@ ImageEffect_FilmGrain::ImageEffect_FilmGrain(TQWidget* parent)
TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 1, 1, 0, spacingHint()); TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 1, 1, 0, spacingHint());
TQLabel *label1 = new TQLabel(i18n("Sensitivity (ISO):"), gboxSettings); TQLabel *label1 = new TQLabel(i18n("Sensitivity (ISO):"), gboxSettings);
m_sensibilitySlider = new TQSlider(2, 30, 1, 12, Qt::Horizontal, gboxSettings); m_sensibilitySlider = new TQSlider(2, 30, 1, 12, TQt::Horizontal, gboxSettings);
m_sensibilitySlider->setTracking ( false ); m_sensibilitySlider->setTracking ( false );
m_sensibilitySlider->setTickInterval(1); m_sensibilitySlider->setTickInterval(1);
m_sensibilitySlider->setTickmarks(TQSlider::Below); m_sensibilitySlider->setTickmarks(TQSlider::Below);

@ -88,7 +88,7 @@ ImageEffect_Infrared::ImageEffect_Infrared(TQWidget* parent)
TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 2, 1, 0, spacingHint()); TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 2, 1, 0, spacingHint());
TQLabel *label1 = new TQLabel(i18n("Sensitivity (ISO):"), gboxSettings); TQLabel *label1 = new TQLabel(i18n("Sensitivity (ISO):"), gboxSettings);
m_sensibilitySlider = new TQSlider(1, 25, 1, 1, Qt::Horizontal, gboxSettings); m_sensibilitySlider = new TQSlider(1, 25, 1, 1, TQt::Horizontal, gboxSettings);
m_sensibilitySlider->setTracking ( false ); m_sensibilitySlider->setTracking ( false );
m_sensibilitySlider->setTickInterval(1); m_sensibilitySlider->setTickInterval(1);
m_sensibilitySlider->setTickmarks(TQSlider::Below); m_sensibilitySlider->setTickmarks(TQSlider::Below);

@ -78,7 +78,7 @@ InfraredTool::InfraredTool(TQObject* parent)
TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 3, 1); TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 3, 1);
TQLabel *label1 = new TQLabel(i18n("Sensitivity (ISO):"), m_gboxSettings->plainPage()); TQLabel *label1 = new TQLabel(i18n("Sensitivity (ISO):"), m_gboxSettings->plainPage());
m_sensibilitySlider = new TQSlider(1, 25, 1, 1, Qt::Horizontal, m_gboxSettings->plainPage()); m_sensibilitySlider = new TQSlider(1, 25, 1, 1, TQt::Horizontal, m_gboxSettings->plainPage());
m_sensibilitySlider->setTracking(false); m_sensibilitySlider->setTracking(false);
m_sensibilitySlider->setTickInterval(1); m_sensibilitySlider->setTickInterval(1);
m_sensibilitySlider->setTickmarks(TQSlider::Below); m_sensibilitySlider->setTickmarks(TQSlider::Below);

@ -574,7 +574,7 @@ void InsertTextWidget::resizeEvent(TQResizeEvent * e)
void InsertTextWidget::mousePressEvent ( TQMouseEvent * e ) void InsertTextWidget::mousePressEvent ( TQMouseEvent * e )
{ {
if ( e->button() == Qt::LeftButton && if ( e->button() == TQt::LeftButton &&
m_textRect.contains( e->x(), e->y() ) ) m_textRect.contains( e->x(), e->y() ) )
{ {
m_xpos = e->x(); m_xpos = e->x();
@ -594,7 +594,7 @@ void InsertTextWidget::mouseMoveEvent ( TQMouseEvent * e )
{ {
if ( rect().contains( e->x(), e->y() ) ) if ( rect().contains( e->x(), e->y() ) )
{ {
if ( e->state() == Qt::LeftButton && m_currentMoving ) if ( e->state() == TQt::LeftButton && m_currentMoving )
{ {
uint newxpos = e->x(); uint newxpos = e->x();
uint newypos = e->y(); uint newypos = e->y();

@ -675,7 +675,7 @@ void PerspectiveWidget::resizeEvent(TQResizeEvent * e)
void PerspectiveWidget::mousePressEvent ( TQMouseEvent * e ) void PerspectiveWidget::mousePressEvent ( TQMouseEvent * e )
{ {
if ( e->button() == Qt::LeftButton && if ( e->button() == TQt::LeftButton &&
m_rect.contains( e->x(), e->y() )) m_rect.contains( e->x(), e->y() ))
{ {
if ( m_topLeftCorner.contains( e->x(), e->y() ) ) if ( m_topLeftCorner.contains( e->x(), e->y() ) )
@ -719,7 +719,7 @@ void PerspectiveWidget::mouseReleaseEvent ( TQMouseEvent * e )
void PerspectiveWidget::mouseMoveEvent ( TQMouseEvent * e ) void PerspectiveWidget::mouseMoveEvent ( TQMouseEvent * e )
{ {
if ( e->state() == Qt::LeftButton ) if ( e->state() == TQt::LeftButton )
{ {
if ( m_currentResizing != ResizingNone ) if ( m_currentResizing != ResizingNone )
{ {

@ -243,7 +243,7 @@ bool SuperImposeWidget::zoomSelection(float deltaZoomFactor)
void SuperImposeWidget::mousePressEvent ( TQMouseEvent * e ) void SuperImposeWidget::mousePressEvent ( TQMouseEvent * e )
{ {
if ( isEnabled() && e->button() == Qt::LeftButton && if ( isEnabled() && e->button() == TQt::LeftButton &&
rect().contains( e->x(), e->y() ) ) rect().contains( e->x(), e->y() ) )
{ {
switch (m_editMode) switch (m_editMode)
@ -274,7 +274,7 @@ void SuperImposeWidget::mouseMoveEvent ( TQMouseEvent * e )
{ {
if ( isEnabled() ) if ( isEnabled() )
{ {
if ( e->state() == Qt::LeftButton ) if ( e->state() == TQt::LeftButton )
{ {
switch (m_editMode) switch (m_editMode)
{ {

@ -212,7 +212,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name,
TQWidget *gboxGuideSettings = new TQWidget(d->settings); TQWidget *gboxGuideSettings = new TQWidget(d->settings);
TQGridLayout* grid = new TQGridLayout( gboxGuideSettings, 2, 2, marginHint(), spacingHint()); TQGridLayout* grid = new TQGridLayout( gboxGuideSettings, 2, 2, marginHint(), spacingHint());
KSeparator *line = new KSeparator(Qt::Horizontal, gboxGuideSettings); KSeparator *line = new KSeparator(TQt::Horizontal, gboxGuideSettings);
grid->addMultiCellWidget(line, 0, 0, 0, 2); grid->addMultiCellWidget(line, 0, 0, 0, 2);
TQLabel *label5 = new TQLabel(i18n("Guide color:"), gboxGuideSettings); TQLabel *label5 = new TQLabel(i18n("Guide color:"), gboxGuideSettings);

@ -470,7 +470,7 @@ bool DMetadata::getXMLImageProperties(TQString& comments, TQDateTime& date,
else if (name == TQString::fromLatin1("date")) else if (name == TQString::fromLatin1("date"))
{ {
if (val.isEmpty()) continue; if (val.isEmpty()) continue;
date = TQDateTime::fromString(val, Qt::ISODate); date = TQDateTime::fromString(val, TQt::ISODate);
} }
else if (name == TQString::fromLatin1("rating")) else if (name == TQString::fromLatin1("rating"))
{ {
@ -516,7 +516,7 @@ bool DMetadata::setXMLImageProperties(const TQString& comments, const TQDateTime
propertiesElem.appendChild(c); propertiesElem.appendChild(c);
TQDomElement d = xmlDoc.createElement(TQString::fromLatin1("date")); TQDomElement d = xmlDoc.createElement(TQString::fromLatin1("date"));
d.setAttribute(TQString::fromLatin1("value"), date.toString(Qt::ISODate)); d.setAttribute(TQString::fromLatin1("value"), date.toString(TQt::ISODate));
propertiesElem.appendChild(d); propertiesElem.appendChild(d);
TQDomElement r = xmlDoc.createElement(TQString::fromLatin1("rating")); TQDomElement r = xmlDoc.createElement(TQString::fromLatin1("rating"));

@ -191,7 +191,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar)
d->newFileName = new TQLabel(i18n("<nobr><b>New Name</b></nobr>:"), d->settingsArea); d->newFileName = new TQLabel(i18n("<nobr><b>New Name</b></nobr>:"), d->settingsArea);
d->downloaded = new TQLabel(i18n("<b>Downloaded</b>:"), d->settingsArea); d->downloaded = new TQLabel(i18n("<b>Downloaded</b>:"), d->settingsArea);
KSeparator *line = new KSeparator(Qt::Horizontal, d->settingsArea); KSeparator *line = new KSeparator(TQt::Horizontal, d->settingsArea);
d->title2 = new TQLabel(i18n("<big><b>Photograph Properties</b></big>"), d->settingsArea); d->title2 = new TQLabel(i18n("<big><b>Photograph Properties</b></big>"), d->settingsArea);
d->make = new TQLabel(i18n("<b>Make</b>:"), d->settingsArea); d->make = new TQLabel(i18n("<b>Make</b>:"), d->settingsArea);
d->model = new TQLabel(i18n("<b>Model</b>:"), d->settingsArea); d->model = new TQLabel(i18n("<b>Model</b>:"), d->settingsArea);

@ -277,7 +277,7 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar
// ------------------------------------------------------------- // -------------------------------------------------------------
TQGroupBox *gbox = new TQGroupBox(2, Qt::Horizontal, i18n("Statistics"), histogramPage); TQGroupBox *gbox = new TQGroupBox(2, TQt::Horizontal, i18n("Statistics"), histogramPage);
TQWhatsThis::add( gbox, i18n("<p>Here you can see the statistical results calculated from the " TQWhatsThis::add( gbox, i18n("<p>Here you can see the statistical results calculated from the "
"selected histogram part. These values are available for all " "selected histogram part. These values are available for all "
"channels.")); "channels."));

@ -202,7 +202,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
d->owner = new TQLabel(i18n("<b>Owner</b>:"), d->settingsArea); d->owner = new TQLabel(i18n("<b>Owner</b>:"), d->settingsArea);
d->permissions = new TQLabel(i18n("<b>Permissions</b>:"), d->settingsArea); d->permissions = new TQLabel(i18n("<b>Permissions</b>:"), d->settingsArea);
KSeparator *line = new KSeparator(Qt::Horizontal, d->settingsArea); KSeparator *line = new KSeparator(TQt::Horizontal, d->settingsArea);
d->title2 = new TQLabel(i18n("<big><b>Image Properties</b></big>"), d->settingsArea); d->title2 = new TQLabel(i18n("<big><b>Image Properties</b></big>"), d->settingsArea);
d->mime = new TQLabel(i18n("<b>Type</b>:"), d->settingsArea); d->mime = new TQLabel(i18n("<b>Type</b>:"), d->settingsArea);
d->dimensions = new TQLabel(i18n("<b>Dimensions</b>:"), d->settingsArea); d->dimensions = new TQLabel(i18n("<b>Dimensions</b>:"), d->settingsArea);
@ -210,7 +210,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
d->bitDepth = new TQLabel(i18n("<nobr><b>Bit depth</b></nobr>:"), d->settingsArea); d->bitDepth = new TQLabel(i18n("<nobr><b>Bit depth</b></nobr>:"), d->settingsArea);
d->colorMode = new TQLabel(i18n("<nobr><b>Color mode</b></nobr>:"), d->settingsArea); d->colorMode = new TQLabel(i18n("<nobr><b>Color mode</b></nobr>:"), d->settingsArea);
KSeparator *line2 = new KSeparator(Qt::Horizontal, d->settingsArea); KSeparator *line2 = new KSeparator(TQt::Horizontal, d->settingsArea);
d->title3 = new TQLabel(i18n("<big><b>Photograph Properties</b></big>"), d->settingsArea); d->title3 = new TQLabel(i18n("<big><b>Photograph Properties</b></big>"), d->settingsArea);
d->make = new TQLabel(i18n("<b>Make</b>:"), d->settingsArea); d->make = new TQLabel(i18n("<b>Make</b>:"), d->settingsArea);
d->model = new TQLabel(i18n("<b>Model</b>:"), d->settingsArea); d->model = new TQLabel(i18n("<b>Model</b>:"), d->settingsArea);

@ -1625,7 +1625,7 @@ namespace Digikam
* or recompression of the image. * or recompression of the image.
* Thanks to Guido Vollbeding for the initial design and code of this feature. * Thanks to Guido Vollbeding for the initial design and code of this feature.
* *
*Qt::Horizontal flipping is done in-place, using a single top-to-bottom * Horizontal flipping is done in-place, using a single top-to-bottom
* pass through the virtual source array. It will thus be much the * pass through the virtual source array. It will thus be much the
* fastest option for images larger than main memory. * fastest option for images larger than main memory.
* *
@ -1660,7 +1660,7 @@ namespace Digikam
LOCAL(void) LOCAL(void)
do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
jvirt_barray_ptr *src_coef_arrays) jvirt_barray_ptr *src_coef_arrays)
/*Qt::Horizontal flip; done in-place, so no separate dest array is required */ /* Horizontal flip; done in-place, so no separate dest array is required */
{ {
JDIMENSION MCU_cols, comp_width, blk_x, blk_y; JDIMENSION MCU_cols, comp_width, blk_x, blk_y;
int ci, k, offset_y; int ci, k, offset_y;
@ -1669,7 +1669,7 @@ do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
JCOEF temp1, temp2; JCOEF temp1, temp2;
jpeg_component_info *compptr; jpeg_component_info *compptr;
/*Qt::Horizontal mirroring of DCT blocks is accomplished by swapping /* Horizontal mirroring of DCT blocks is accomplished by swapping
* pairs of blocks in-place. Within a DCT block, we perform horizontal * pairs of blocks in-place. Within a DCT block, we perform horizontal
* mirroring by changing the signs of odd-numbered columns. * mirroring by changing the signs of odd-numbered columns.
* Partial iMCUs at the right edge are left untouched. * Partial iMCUs at the right edge are left untouched.
@ -1710,7 +1710,7 @@ LOCAL(void)
do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
jvirt_barray_ptr *src_coef_arrays, jvirt_barray_ptr *src_coef_arrays,
jvirt_barray_ptr *dst_coef_arrays) jvirt_barray_ptr *dst_coef_arrays)
/*Qt::Vertical flip */ /* Vertical flip */
{ {
JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y; JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y;
int ci, i, j, offset_y; int ci, i, j, offset_y;
@ -1827,7 +1827,7 @@ do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
jvirt_barray_ptr *dst_coef_arrays) jvirt_barray_ptr *dst_coef_arrays)
/* 90 degree rotation is equivalent to /* 90 degree rotation is equivalent to
* 1. Transposing the image; * 1. Transposing the image;
* 2.Qt::Horizontal mirroring. * 2. Horizontal mirroring.
* These two steps are merged into a single processing routine. * These two steps are merged into a single processing routine.
*/ */
{ {
@ -1890,7 +1890,7 @@ do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
jvirt_barray_ptr *src_coef_arrays, jvirt_barray_ptr *src_coef_arrays,
jvirt_barray_ptr *dst_coef_arrays) jvirt_barray_ptr *dst_coef_arrays)
/* 270 degree rotation is equivalent to /* 270 degree rotation is equivalent to
* 1.Qt::Horizontal mirroring; * 1. Horizontal mirroring;
* 2. Transposing the image. * 2. Transposing the image.
* These two steps are merged into a single processing routine. * These two steps are merged into a single processing routine.
*/ */
@ -1954,8 +1954,8 @@ do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
jvirt_barray_ptr *src_coef_arrays, jvirt_barray_ptr *src_coef_arrays,
jvirt_barray_ptr *dst_coef_arrays) jvirt_barray_ptr *dst_coef_arrays)
/* 180 degree rotation is equivalent to /* 180 degree rotation is equivalent to
* 1.Qt::Vertical mirroring; * 1. Vertical mirroring;
* 2.Qt::Horizontal mirroring. * 2. Horizontal mirroring.
* These two steps are merged into a single processing routine. * These two steps are merged into a single processing routine.
*/ */
{ {
@ -2058,9 +2058,9 @@ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
* 1. 180 degree rotation; * 1. 180 degree rotation;
* 2. Transposition; * 2. Transposition;
* or * or
* 1.Qt::Horizontal mirroring; * 1. Horizontal mirroring;
* 2. Transposition; * 2. Transposition;
* 3.Qt::Horizontal mirroring. * 3. Horizontal mirroring.
* These steps are merged into a single processing routine. * These steps are merged into a single processing routine.
*/ */
{ {

@ -173,7 +173,7 @@ ThumbBarView::ThumbBarView(TQWidget* parent, int orientation, bool exifRotate,
setFrameStyle(TQFrame::NoFrame); setFrameStyle(TQFrame::NoFrame);
setAcceptDrops(true); setAcceptDrops(true);
if (d->orientation ==Qt::Vertical) if (d->orientation ==TQt::Vertical)
{ {
setHScrollBarMode(TQScrollView::AlwaysOff); setHScrollBarMode(TQScrollView::AlwaysOff);
} }
@ -204,7 +204,7 @@ void ThumbBarView::resizeEvent(TQResizeEvent* e)
TQScrollView::resizeEvent(e); TQScrollView::resizeEvent(e);
if (d->orientation ==Qt::Vertical) if (d->orientation ==TQt::Vertical)
{ {
d->tileSize = width() - 2*d->margin - verticalScrollBar()->sizeHint().width(); d->tileSize = width() - 2*d->margin - verticalScrollBar()->sizeHint().width();
verticalScrollBar()->setLineStep(d->tileSize); verticalScrollBar()->setLineStep(d->tileSize);
@ -345,7 +345,7 @@ ThumbBarItem* ThumbBarView::findItem(const TQPoint& pos) const
{ {
int itemPos; int itemPos;
if (d->orientation ==Qt::Vertical) if (d->orientation ==TQt::Vertical)
itemPos = pos.y(); itemPos = pos.y();
else else
itemPos = pos.x(); itemPos = pos.x();
@ -403,7 +403,7 @@ void ThumbBarView::ensureItemVisible(ThumbBarItem* item)
// We want the complete thumb visible and the next one. // We want the complete thumb visible and the next one.
// find the middle of the image and give a margin of 1,5 image // find the middle of the image and give a margin of 1,5 image
// When changed, watch regression for bug 104031 // When changed, watch regression for bug 104031
if (d->orientation ==Qt::Vertical) if (d->orientation ==TQt::Vertical)
ensureVisible(0, (int)(item->d->pos + d->margin + d->tileSize*.5), ensureVisible(0, (int)(item->d->pos + d->margin + d->tileSize*.5),
0, (int)(d->tileSize*1.5 + 3*d->margin)); 0, (int)(d->tileSize*1.5 + 3*d->margin));
else else
@ -455,7 +455,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e)
TQPixmap bgPix, tile; TQPixmap bgPix, tile;
TQRect er(e->rect()); TQRect er(e->rect());
if (d->orientation ==Qt::Vertical) if (d->orientation ==TQt::Vertical)
{ {
cy = viewportToContents(er.topLeft()).y(); cy = viewportToContents(er.topLeft()).y();
@ -484,7 +484,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e)
for (ThumbBarItem *item = d->firstItem; item; item = item->d->next) for (ThumbBarItem *item = d->firstItem; item; item = item->d->next)
{ {
if (d->orientation ==Qt::Vertical) if (d->orientation ==TQt::Vertical)
{ {
if (y1 <= item->d->pos && item->d->pos <= y2) if (y1 <= item->d->pos && item->d->pos <= y2)
{ {
@ -540,7 +540,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e)
} }
} }
if (d->orientation ==Qt::Vertical) if (d->orientation ==TQt::Vertical)
bitBlt(viewport(), 0, er.y(), &bgPix); bitBlt(viewport(), 0, er.y(), &bgPix);
else else
bitBlt(viewport(), er.x(), 0, &bgPix); bitBlt(viewport(), er.x(), 0, &bgPix);
@ -570,7 +570,7 @@ void ThumbBarView::contentsMouseMoveEvent(TQMouseEvent *e)
{ {
if (!e) return; if (!e) return;
if (d->dragging && (e->state() & Qt::LeftButton)) if (d->dragging && (e->state() & TQt::LeftButton))
{ {
if ( findItem(d->dragStartPos) && if ( findItem(d->dragStartPos) &&
(d->dragStartPos - e->pos()).manhattanLength() > TQApplication::startDragDistance() ) (d->dragStartPos - e->pos()).manhattanLength() > TQApplication::startDragDistance() )
@ -600,14 +600,14 @@ void ThumbBarView::contentsWheelEvent(TQWheelEvent *e)
{ {
if (e->state() & TQt::ShiftButton) if (e->state() & TQt::ShiftButton)
{ {
if (d->orientation ==Qt::Vertical) if (d->orientation ==TQt::Vertical)
scrollBy(0, verticalScrollBar()->pageStep()); scrollBy(0, verticalScrollBar()->pageStep());
else else
scrollBy(horizontalScrollBar()->pageStep(), 0); scrollBy(horizontalScrollBar()->pageStep(), 0);
} }
else else
{ {
if (d->orientation ==Qt::Vertical) if (d->orientation ==TQt::Vertical)
scrollBy(0, verticalScrollBar()->lineStep()); scrollBy(0, verticalScrollBar()->lineStep());
else else
scrollBy(horizontalScrollBar()->lineStep(), 0); scrollBy(horizontalScrollBar()->lineStep(), 0);
@ -618,14 +618,14 @@ void ThumbBarView::contentsWheelEvent(TQWheelEvent *e)
{ {
if (e->state() & TQt::ShiftButton) if (e->state() & TQt::ShiftButton)
{ {
if (d->orientation ==Qt::Vertical) if (d->orientation ==TQt::Vertical)
scrollBy(0, (-1)*verticalScrollBar()->pageStep()); scrollBy(0, (-1)*verticalScrollBar()->pageStep());
else else
scrollBy((-1)*horizontalScrollBar()->pageStep(), 0); scrollBy((-1)*horizontalScrollBar()->pageStep(), 0);
} }
else else
{ {
if (d->orientation ==Qt::Vertical) if (d->orientation ==TQt::Vertical)
scrollBy(0, (-1)*verticalScrollBar()->lineStep()); scrollBy(0, (-1)*verticalScrollBar()->lineStep());
else else
scrollBy((-1)*horizontalScrollBar()->lineStep(), 0); scrollBy((-1)*horizontalScrollBar()->lineStep(), 0);
@ -736,7 +736,7 @@ void ThumbBarView::rearrangeItems()
item = item->d->next; item = item->d->next;
} }
if (d->orientation ==Qt::Vertical) if (d->orientation ==TQt::Vertical)
resizeContents(visibleWidth(), d->count*(d->tileSize+2*d->margin)); resizeContents(visibleWidth(), d->count*(d->tileSize+2*d->margin));
else else
resizeContents(d->count*(d->tileSize+2*d->margin), visibleHeight()); resizeContents(d->count*(d->tileSize+2*d->margin), visibleHeight());
@ -763,7 +763,7 @@ void ThumbBarView::repaintItem(ThumbBarItem* item)
{ {
if (item) if (item)
{ {
if (d->orientation ==Qt::Vertical) if (d->orientation ==TQt::Vertical)
repaintContents(0, item->d->pos, visibleWidth(), d->tileSize+2*d->margin); repaintContents(0, item->d->pos, visibleWidth(), d->tileSize+2*d->margin);
else else
repaintContents(item->d->pos, 0, d->tileSize+2*d->margin, visibleHeight()); repaintContents(item->d->pos, 0, d->tileSize+2*d->margin, visibleHeight());

@ -61,7 +61,7 @@ ColorGradientWidget::ColorGradientWidget(int o, int size, TQWidget *parent)
setFrameStyle(TQFrame::Box|TQFrame::Plain); setFrameStyle(TQFrame::Box|TQFrame::Plain);
setLineWidth(1); setLineWidth(1);
if ( d->orientation ==Qt::Horizontal ) if ( d->orientation ==TQt::Horizontal )
setFixedHeight( size ); setFixedHeight( size );
else else
setFixedWidth( size ); setFixedWidth( size );
@ -105,7 +105,7 @@ void ColorGradientWidget::drawContents(TQPainter *p)
int greenDiff = color2.green() - color1.green(); int greenDiff = color2.green() - color1.green();
int blueDiff = color2.blue() - color1.blue(); int blueDiff = color2.blue() - color1.blue();
if ( d->orientation ==Qt::Vertical ) if ( d->orientation ==TQt::Vertical )
{ {
for ( int y = 0; y < image.height(); y++ ) for ( int y = 0; y < image.height(); y++ )
{ {

@ -616,7 +616,7 @@ void CurvesWidget::mousePressEvent(TQMouseEvent *e)
int closest_point; int closest_point;
int distance; int distance;
if (e->button() != Qt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted) if (e->button() != TQt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted)
return; return;
int x = CLAMP((int)(e->pos().x() * int x = CLAMP((int)(e->pos().x() *
@ -701,7 +701,7 @@ void CurvesWidget::mouseReleaseEvent(TQMouseEvent *e)
{ {
if (d->readOnlyMode || !m_imageHistogram) return; if (d->readOnlyMode || !m_imageHistogram) return;
if (e->button() != Qt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted) if (e->button() != TQt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted)
return; return;
setCursor(KCursor::arrowCursor()); setCursor(KCursor::arrowCursor());

@ -66,7 +66,7 @@ bool DCursorTracker::eventFilter(TQObject *object, TQEvent *e)
{ {
TQMouseEvent *event = TQT_TQMOUSEEVENT(e); TQMouseEvent *event = TQT_TQMOUSEEVENT(e);
if (m_enable && (widget->rect().contains(event->pos()) || if (m_enable && (widget->rect().contains(event->pos()) ||
(event->stateAfter() & Qt::LeftButton))) (event->stateAfter() & TQt::LeftButton)))
{ {
show(); show();
TQPoint p = widget->mapToGlobal(TQPoint(widget->width()/2, 0)); TQPoint p = widget->mapToGlobal(TQPoint(widget->width()/2, 0));

@ -247,7 +247,7 @@ void PanIconWidget::hideEvent(TQHideEvent *e)
void PanIconWidget::mousePressEvent ( TQMouseEvent * e ) void PanIconWidget::mousePressEvent ( TQMouseEvent * e )
{ {
if ( (e->button() == Qt::LeftButton || e->button() == Qt::MidButton) && if ( (e->button() == TQt::LeftButton || e->button() == TQt::MidButton) &&
m_localRegionSelection.contains( e->x(), e->y() ) ) m_localRegionSelection.contains( e->x(), e->y() ) )
{ {
d->xpos = e->x(); d->xpos = e->x();
@ -261,7 +261,7 @@ void PanIconWidget::mousePressEvent ( TQMouseEvent * e )
void PanIconWidget::mouseMoveEvent ( TQMouseEvent * e ) void PanIconWidget::mouseMoveEvent ( TQMouseEvent * e )
{ {
if ( d->moveSelection && if ( d->moveSelection &&
(e->state() == Qt::LeftButton || e->state() == Qt::MidButton) ) (e->state() == TQt::LeftButton || e->state() == TQt::MidButton) )
{ {
int newxpos = e->x(); int newxpos = e->x();
int newypos = e->y(); int newypos = e->y();

@ -545,16 +545,16 @@ void PreviewWidget::viewportPaintEvent(TQPaintEvent *e)
void PreviewWidget::contentsMousePressEvent(TQMouseEvent *e) void PreviewWidget::contentsMousePressEvent(TQMouseEvent *e)
{ {
if (!e || e->button() == Qt::RightButton) if (!e || e->button() == TQt::RightButton)
return; return;
m_movingInProgress = false; m_movingInProgress = false;
if (e->button() == Qt::LeftButton) if (e->button() == TQt::LeftButton)
{ {
emit signalLeftButtonClicked(); emit signalLeftButtonClicked();
} }
else if (e->button() == Qt::MidButton) else if (e->button() == TQt::MidButton)
{ {
if (visibleWidth() < d->zoomWidth || if (visibleWidth() < d->zoomWidth ||
visibleHeight() < d->zoomHeight) visibleHeight() < d->zoomHeight)
@ -575,7 +575,7 @@ void PreviewWidget::contentsMouseMoveEvent(TQMouseEvent *e)
{ {
if (!e) return; if (!e) return;
if (e->state() & Qt::MidButton) if (e->state() & TQt::MidButton)
{ {
if (m_movingInProgress) if (m_movingInProgress)
{ {
@ -592,14 +592,14 @@ void PreviewWidget::contentsMouseReleaseEvent(TQMouseEvent *e)
m_movingInProgress = false; m_movingInProgress = false;
if (e->button() == Qt::MidButton) if (e->button() == TQt::MidButton)
{ {
emit signalContentsMovedEvent(true); emit signalContentsMovedEvent(true);
viewport()->unsetCursor(); viewport()->unsetCursor();
viewport()->repaint(false); viewport()->repaint(false);
} }
if (e->button() == Qt::RightButton) if (e->button() == TQt::RightButton)
{ {
emit signalRightButtonClicked(); emit signalRightButtonClicked();
} }

@ -117,7 +117,7 @@ StatusZoomBar::StatusZoomBar(TQWidget *parent)
d->zoomSlider->setMaxValue(ThumbnailSize::Huge); d->zoomSlider->setMaxValue(ThumbnailSize::Huge);
d->zoomSlider->setPageStep(ThumbnailSize::Step); d->zoomSlider->setPageStep(ThumbnailSize::Step);
d->zoomSlider->setValue(ThumbnailSize::Medium); d->zoomSlider->setValue(ThumbnailSize::Medium);
d->zoomSlider->setOrientation(Qt::Horizontal); d->zoomSlider->setOrientation(TQt::Horizontal);
d->zoomSlider->setLineStep(ThumbnailSize::Step); d->zoomSlider->setLineStep(ThumbnailSize::Step);
d->zoomSlider->setMaximumHeight(fontMetrics().height()+2); d->zoomSlider->setMaximumHeight(fontMetrics().height()+2);
d->zoomSlider->setFixedWidth(120); d->zoomSlider->setFixedWidth(120);

@ -496,7 +496,7 @@ void ImageGuideWidget::resizeEvent(TQResizeEvent* e)
void ImageGuideWidget::mousePressEvent(TQMouseEvent* e) void ImageGuideWidget::mousePressEvent(TQMouseEvent* e)
{ {
if ( !d->focus && e->button() == Qt::LeftButton && if ( !d->focus && e->button() == TQt::LeftButton &&
d->rect.contains( e->x(), e->y() ) && d->spotVisible ) d->rect.contains( e->x(), e->y() ) && d->spotVisible )
{ {
d->focus = true; d->focus = true;

@ -110,7 +110,7 @@ GPSWidget::GPSWidget(TQWidget* parent, const char* name)
// -------------------------------------------------------- // --------------------------------------------------------
TQGroupBox* box2 = new TQGroupBox( 0, Qt::Vertical, gpsInfo ); TQGroupBox* box2 = new TQGroupBox( 0, TQt::Vertical, gpsInfo );
box2->setInsideMargin(0); box2->setInsideMargin(0);
box2->setInsideSpacing(0); box2->setInsideSpacing(0);
box2->setFrameStyle( TQFrame::NoFrame ); box2->setFrameStyle( TQFrame::NoFrame );

@ -176,7 +176,7 @@ void WorldMapWidget::drawContents(TQPainter *p, int x, int y, int w, int h)
void WorldMapWidget::contentsMousePressEvent ( TQMouseEvent * e ) void WorldMapWidget::contentsMousePressEvent ( TQMouseEvent * e )
{ {
if ( e->button() == Qt::LeftButton ) if ( e->button() == TQt::LeftButton )
{ {
d->xMousePos = e->x(); d->xMousePos = e->x();
d->yMousePos = e->y(); d->yMousePos = e->y();
@ -191,7 +191,7 @@ void WorldMapWidget::contentsMouseReleaseEvent ( TQMouseEvent * )
void WorldMapWidget::contentsMouseMoveEvent( TQMouseEvent * e ) void WorldMapWidget::contentsMouseMoveEvent( TQMouseEvent * e )
{ {
if ( e->state() == Qt::LeftButton ) if ( e->state() == TQt::LeftButton )
{ {
uint newxpos = e->x(); uint newxpos = e->x();
uint newypos = e->y(); uint newypos = e->y();

@ -430,10 +430,10 @@ void ShowFoto::setupUserArea()
} }
else // Horizontal thumbbar layout else // Horizontal thumbbar layout
{ {
m_splitter = new TQSplitter(Qt::Horizontal, widget); m_splitter = new TQSplitter(TQt::Horizontal, widget);
TQWidget* widget2 = new TQWidget(m_splitter); TQWidget* widget2 = new TQWidget(m_splitter);
TQVBoxLayout *vlay = new TQVBoxLayout(widget2); TQVBoxLayout *vlay = new TQVBoxLayout(widget2);
d->vSplitter = new TQSplitter(Qt::Vertical, widget2); d->vSplitter = new TQSplitter(TQt::Vertical, widget2);
m_stackView = new Digikam::EditorStackView(d->vSplitter); m_stackView = new Digikam::EditorStackView(d->vSplitter);
m_canvas = new Digikam::Canvas(m_stackView); m_canvas = new Digikam::Canvas(m_stackView);
d->thumbBar = new Digikam::ThumbBarView(d->vSplitter, Digikam::ThumbBarView::Horizontal); d->thumbBar = new Digikam::ThumbBarView(d->vSplitter, Digikam::ThumbBarView::Horizontal);

@ -584,7 +584,7 @@ void tdeio_digikamalbums::put(const KURL& url, int permissions, bool overwrite,
// set modification time // set modification time
const TQString mtimeStr = metaData( "modified" ); const TQString mtimeStr = metaData( "modified" );
if ( !mtimeStr.isEmpty() ) { if ( !mtimeStr.isEmpty() ) {
TQDateTime dt = TQDateTime::fromString( mtimeStr, Qt::ISODate ); TQDateTime dt = TQDateTime::fromString( mtimeStr, TQt::ISODate );
if ( dt.isValid() ) { if ( dt.isValid() ) {
KDE_struct_stat dest_statbuf; KDE_struct_stat dest_statbuf;
if (KDE_stat( _dest.data(), &dest_statbuf ) == 0) { if (KDE_stat( _dest.data(), &dest_statbuf ) == 0) {
@ -670,7 +670,7 @@ void tdeio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool
// copy metadata of album to destination album // copy metadata of album to destination album
m_sqlDB.execSql( TQString("UPDATE Albums SET date='%1', caption='%2', " m_sqlDB.execSql( TQString("UPDATE Albums SET date='%1', caption='%2', "
"collection='%3', icon=%4 ") "collection='%3', icon=%4 ")
.arg(srcAlbum.date.toString(Qt::ISODate), .arg(srcAlbum.date.toString(TQt::ISODate),
escapeString(srcAlbum.caption), escapeString(srcAlbum.caption),
escapeString(srcAlbum.collection), escapeString(srcAlbum.collection),
TQString::number(srcAlbum.icon)) + TQString::number(srcAlbum.icon)) +
@ -1124,7 +1124,7 @@ void tdeio_digikamalbums::mkdir( const KURL& url, int permissions )
m_sqlDB.execSql( TQString("REPLACE INTO Albums (url, date) " m_sqlDB.execSql( TQString("REPLACE INTO Albums (url, date) "
"VALUES('%1','%2')") "VALUES('%1','%2')")
.arg(escapeString(url.path()), .arg(escapeString(url.path()),
TQDate::currentDate().toString(Qt::ISODate)) ); TQDate::currentDate().toString(TQt::ISODate)) );
if ( permissions != -1 ) if ( permissions != -1 )
{ {
@ -1365,7 +1365,7 @@ void tdeio_digikamalbums::buildAlbumList()
++it; ++it;
info.url = *it; info.url = *it;
++it; ++it;
info.date = TQDate::fromString(*it, Qt::ISODate); info.date = TQDate::fromString(*it, TQt::ISODate);
++it; ++it;
info.caption = *it; info.caption = *it;
++it; ++it;
@ -1403,7 +1403,7 @@ AlbumInfo tdeio_digikamalbums::findAlbum(const TQString& url, bool addIfNotExist
m_sqlDB.execSql(TQString("INSERT INTO Albums (url, date) " m_sqlDB.execSql(TQString("INSERT INTO Albums (url, date) "
"VALUES('%1', '%2')") "VALUES('%1', '%2')")
.arg(escapeString(url), .arg(escapeString(url),
fi.lastModified().date().toString(Qt::ISODate))); fi.lastModified().date().toString(TQt::ISODate)));
album.id = m_sqlDB.lastInsertedRow(); album.id = m_sqlDB.lastInsertedRow();
album.url = url; album.url = url;
@ -1519,7 +1519,7 @@ void tdeio_digikamalbums::addImage(int albumID, const TQString& filePath)
"VALUES(%1, '%2', '%3', '%4')") "VALUES(%1, '%2', '%3', '%4')")
.arg(TQString::number(albumID), .arg(TQString::number(albumID),
escapeString(TQFileInfo(filePath).fileName()), escapeString(TQFileInfo(filePath).fileName()),
datetime.toString(Qt::ISODate), datetime.toString(TQt::ISODate),
escapeString(comment))); escapeString(comment)));
TQ_LLONG imageID = m_sqlDB.lastInsertedRow(); TQ_LLONG imageID = m_sqlDB.lastInsertedRow();
@ -1861,7 +1861,7 @@ void tdeio_digikamalbums::scanOneAlbum(const TQString& url)
m_sqlDB.execSql(TQString("INSERT INTO Albums (url, date) " m_sqlDB.execSql(TQString("INSERT INTO Albums (url, date) "
"VALUES('%1', '%2')") "VALUES('%1', '%2')")
.arg(escapeString(*it), .arg(escapeString(*it),
fi.lastModified().date().toString(Qt::ISODate))); fi.lastModified().date().toString(TQt::ISODate)));
scanAlbum(*it); scanAlbum(*it);
} }

@ -154,7 +154,7 @@ void tdeio_digikamdates::special(const TQByteArray& data)
if ( !matchFilterList( regex, name ) ) if ( !matchFilterList( regex, name ) )
continue; continue;
dateTime = TQDateTime::fromString( dateStr, Qt::ISODate ); dateTime = TQDateTime::fromString( dateStr, TQt::ISODate );
if ( !dateTime.isValid() ) if ( !dateTime.isValid() )
continue; continue;

@ -656,13 +656,13 @@ TQString tdeio_digikamsearch::subQuery(enum tdeio_digikamsearch::SKey key,
// we need to split it into two rules // we need to split it into two rules
if (key == IMAGEDATE && op == EQ) if (key == IMAGEDATE && op == EQ)
{ {
TQDate date = TQDate::fromString(val, Qt::ISODate); TQDate date = TQDate::fromString(val, TQt::ISODate);
if (!date.isValid()) if (!date.isValid())
return query; return query;
query = TQString(" (Images.datetime > '%1' AND Images.datetime < '%2') ") query = TQString(" (Images.datetime > '%1' AND Images.datetime < '%2') ")
.arg(date.addDays(-1).toString(Qt::ISODate)) .arg(date.addDays(-1).toString(TQt::ISODate))
.arg(date.addDays( 1).toString(Qt::ISODate)); .arg(date.addDays( 1).toString(TQt::ISODate));
} }
return query; return query;
@ -694,11 +694,11 @@ extern "C"
TQString tdeio_digikamsearch::possibleDate(const TQString& str, bool& exact) const TQString tdeio_digikamsearch::possibleDate(const TQString& str, bool& exact) const
{ {
TQDate date = TQDate::fromString(str, Qt::ISODate); TQDate date = TQDate::fromString(str, TQt::ISODate);
if (date.isValid()) if (date.isValid())
{ {
exact = true; exact = true;
return date.toString(Qt::ISODate); return date.toString(TQt::ISODate);
} }
exact = false; exact = false;

@ -81,7 +81,7 @@ MainWindow::MainWindow()
TQGridLayout* layout = new TQGridLayout(this); TQGridLayout* layout = new TQGridLayout(this);
TQSplitter* splitter = new TQSplitter(this); TQSplitter* splitter = new TQSplitter(this);
splitter->setOrientation( Qt::Horizontal ); splitter->setOrientation( TQt::Horizontal );
splitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); splitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
m_folderView = new FolderView(splitter); m_folderView = new FolderView(splitter);

@ -151,7 +151,7 @@ void ImageInfoJob::slotData(TDEIO::Job*, const TQByteArray& data)
ds >> dims; ds >> dims;
ImageInfo* info = new ImageInfo(imageID, albumID, name, ImageInfo* info = new ImageInfo(imageID, albumID, name,
TQDateTime::fromString(date, Qt::ISODate), TQDateTime::fromString(date, TQt::ISODate),
size, dims); size, dims);
itemsList.append(info); itemsList.append(info);

@ -1142,13 +1142,13 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album)
switch(d->folderDateFormat->currentItem()) switch(d->folderDateFormat->currentItem())
{ {
case CameraUIPriv::TextDateFormat: case CameraUIPriv::TextDateFormat:
newDirName = dateTime.date().toString(Qt::TextDate); newDirName = dateTime.date().toString(TQt::TextDate);
break; break;
case CameraUIPriv::LocalDateFormat: case CameraUIPriv::LocalDateFormat:
newDirName = dateTime.date().toString(Qt::LocalDate); newDirName = dateTime.date().toString(TQt::LocalDate);
break; break;
default: // IsoDateFormat default: // IsoDateFormat
newDirName = dateTime.date().toString(Qt::ISODate); newDirName = dateTime.date().toString(TQt::ISODate);
break; break;
} }
} }
@ -1234,13 +1234,13 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album)
switch(d->folderDateFormat->currentItem()) switch(d->folderDateFormat->currentItem())
{ {
case CameraUIPriv::TextDateFormat: case CameraUIPriv::TextDateFormat:
dirName = dateTime.date().toString(Qt::TextDate); dirName = dateTime.date().toString(TQt::TextDate);
break; break;
case CameraUIPriv::LocalDateFormat: case CameraUIPriv::LocalDateFormat:
dirName = dateTime.date().toString(Qt::LocalDate); dirName = dateTime.date().toString(TQt::LocalDate);
break; break;
default: // IsoDateFormat default: // IsoDateFormat
dirName = dateTime.date().toString(Qt::ISODate); dirName = dateTime.date().toString(TQt::ISODate);
break; break;
} }
// See B.K.O #136927 : we need to support file system which do not // See B.K.O #136927 : we need to support file system which do not

@ -135,7 +135,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle
setFrameStyle( TQFrame::NoFrame ); setFrameStyle( TQFrame::NoFrame );
setRadioButtonExclusive(true); setRadioButtonExclusive(true);
setColumnLayout(0, Qt::Vertical); setColumnLayout(0, TQt::Vertical);
TQGridLayout* mainLayout = new TQGridLayout(layout(), 4, 1); TQGridLayout* mainLayout = new TQGridLayout(layout(), 4, 1);
// ---------------------------------------------------------------- // ----------------------------------------------------------------
@ -148,7 +148,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle
d->renameDefaultBox = new TQGroupBox( this ); d->renameDefaultBox = new TQGroupBox( this );
d->renameDefaultBox->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain); d->renameDefaultBox->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain);
d->renameDefaultBox->setInsideMargin(0); d->renameDefaultBox->setInsideMargin(0);
d->renameDefaultBox->setColumnLayout(0, Qt::Vertical); d->renameDefaultBox->setColumnLayout(0, TQt::Vertical);
d->renameDefaultCase = new TQLabel( i18n("Change case to:"), d->renameDefaultBox ); d->renameDefaultCase = new TQLabel( i18n("Change case to:"), d->renameDefaultBox );
d->renameDefaultCase->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); d->renameDefaultCase->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
@ -178,7 +178,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle
d->renameCustomBox = new TQGroupBox(this); d->renameCustomBox = new TQGroupBox(this);
d->renameCustomBox->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain); d->renameCustomBox->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain);
d->renameCustomBox->setInsideMargin(0); d->renameCustomBox->setInsideMargin(0);
d->renameCustomBox->setColumnLayout(0, Qt::Vertical); d->renameCustomBox->setColumnLayout(0, TQt::Vertical);
TQGridLayout* renameCustomBoxLayout = new TQGridLayout(d->renameCustomBox->layout(), TQGridLayout* renameCustomBoxLayout = new TQGridLayout(d->renameCustomBox->layout(),
6, 2, KDialogBase::spacingHint()); 6, 2, KDialogBase::spacingHint());
@ -331,13 +331,13 @@ TQString RenameCustomizer::newName(const TQDateTime &dateTime, int index, const
date = dateTime.toString("yyyyMMddThhmmss"); date = dateTime.toString("yyyyMMddThhmmss");
break; break;
case RenameCustomizerPriv::TextDateFormat: case RenameCustomizerPriv::TextDateFormat:
date = dateTime.toString(Qt::TextDate); date = dateTime.toString(TQt::TextDate);
break; break;
case RenameCustomizerPriv::LocalDateFormat: case RenameCustomizerPriv::LocalDateFormat:
date = dateTime.toString(Qt::LocalDate); date = dateTime.toString(TQt::LocalDate);
break; break;
case RenameCustomizerPriv::IsoDateFormat: case RenameCustomizerPriv::IsoDateFormat:
date = dateTime.toString(Qt::ISODate); date = dateTime.toString(TQt::ISODate);
break; break;
case RenameCustomizerPriv::Advanced: case RenameCustomizerPriv::Advanced:
date = dateTime.toString(d->dateTimeFormatString); date = dateTime.toString(d->dateTimeFormatString);

@ -646,12 +646,12 @@ void Canvas::drawRubber()
void Canvas::contentsMousePressEvent(TQMouseEvent *e) void Canvas::contentsMousePressEvent(TQMouseEvent *e)
{ {
if (!e || e->button() == Qt::RightButton) if (!e || e->button() == TQt::RightButton)
return; return;
d->midButtonPressed = false; d->midButtonPressed = false;
if (e->button() == Qt::LeftButton) if (e->button() == TQt::LeftButton)
{ {
if (d->ltActive || d->rtActive || if (d->ltActive || d->rtActive ||
d->lbActive || d->rbActive) d->lbActive || d->rbActive)
@ -695,7 +695,7 @@ void Canvas::contentsMousePressEvent(TQMouseEvent *e)
return; return;
} }
} }
else if (e->button() == Qt::MidButton) else if (e->button() == TQt::MidButton)
{ {
if (visibleWidth() < d->im->width() || if (visibleWidth() < d->im->width() ||
visibleHeight() < d->im->height()) visibleHeight() < d->im->height())
@ -733,7 +733,7 @@ void Canvas::contentsMouseMoveEvent(TQMouseEvent *e)
if (!e) if (!e)
return; return;
if (e->state() & Qt::MidButton) if (e->state() & TQt::MidButton)
{ {
if (d->midButtonPressed) if (d->midButtonPressed)
{ {
@ -746,7 +746,7 @@ void Canvas::contentsMouseMoveEvent(TQMouseEvent *e)
if (!d->rubber) if (!d->rubber)
return; return;
if (e->state() != Qt::LeftButton && if (e->state() != TQt::LeftButton &&
!(d->ltActive || d->rtActive || !(d->ltActive || d->rtActive ||
d->lbActive || d->rbActive)) d->lbActive || d->rbActive))
return; return;
@ -865,12 +865,12 @@ void Canvas::contentsMouseReleaseEvent(TQMouseEvent *e)
emit signalSelected(false); emit signalSelected(false);
} }
if (e->button() != Qt::LeftButton) if (e->button() != TQt::LeftButton)
{ {
viewport()->unsetCursor(); viewport()->unsetCursor();
} }
if (e->button() == Qt::RightButton) if (e->button() == TQt::RightButton)
{ {
emit signalRightButtonClicked(); emit signalRightButtonClicked();
} }

@ -84,7 +84,7 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview,
TQLabel *embeddedProfileTitle = new TQLabel(i18n("Embedded color profile:"), page); TQLabel *embeddedProfileTitle = new TQLabel(i18n("Embedded color profile:"), page);
TQLabel *embeddedProfileDesc = new TQLabel(TQString("<b>%1</b>").arg(m_iccTrans->getEmbeddedProfileDescriptor()), page); TQLabel *embeddedProfileDesc = new TQLabel(TQString("<b>%1</b>").arg(m_iccTrans->getEmbeddedProfileDescriptor()), page);
TQPushButton *embeddedProfInfo = new TQPushButton(i18n("Info..."), page); TQPushButton *embeddedProfInfo = new TQPushButton(i18n("Info..."), page);
KSeparator *line = new KSeparator(Qt::Horizontal, page); KSeparator *line = new KSeparator(TQt::Horizontal, page);
if (m_iccTrans->embeddedProfile().isEmpty()) if (m_iccTrans->embeddedProfile().isEmpty())
{ {
@ -117,7 +117,7 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview,
vlay->addWidget(logo); vlay->addWidget(logo);
vlay->addWidget(message); vlay->addWidget(message);
vlay->addWidget(new KSeparator(Qt::Horizontal, page)); vlay->addWidget(new KSeparator(TQt::Horizontal, page));
vlay->addWidget(currentProfileTitle); vlay->addWidget(currentProfileTitle);
vlay->addWidget(currentProfileDesc); vlay->addWidget(currentProfileDesc);

@ -108,9 +108,9 @@ UndoActionFlip::UndoActionFlip(DImgInterface* iface,
UndoActionFlip::Direction dir) UndoActionFlip::Direction dir)
: UndoAction(iface), m_dir(dir) : UndoAction(iface), m_dir(dir)
{ {
if(m_dir ==Qt::Horizontal) if(m_dir ==TQt::Horizontal)
m_title = i18n("Flip Horizontal"); m_title = i18n("Flip Horizontal");
else if(m_dir ==Qt::Vertical) else if(m_dir ==TQt::Vertical)
m_title = i18n("Flip Vertical"); m_title = i18n("Flip Vertical");
} }
@ -122,10 +122,10 @@ void UndoActionFlip::rollBack()
{ {
switch(m_dir) switch(m_dir)
{ {
case Qt::Horizontal: case TQt::Horizontal:
m_iface->flipHoriz(false); m_iface->flipHoriz(false);
return; return;
case Qt::Vertical: case TQt::Vertical:
m_iface->flipVert(false); m_iface->flipVert(false);
return; return;
default: default:

@ -140,9 +140,9 @@ bool ImagePrint::printImageWithTQt()
// Black & white print ? // Black & white print ?
if ( m_printer.option( "app-imageeditor-blackwhite" ) != f) if ( m_printer.option( "app-imageeditor-blackwhite" ) != f)
{ {
image2Print = image2Print.convertDepth( 1, Qt::MonoOnly | image2Print = image2Print.convertDepth( 1, TQt::MonoOnly |
Qt::ThresholdDither | TQt::ThresholdDither |
Qt::AvoidDither ); TQt::AvoidDither );
} }
TQPainter p; TQPainter p;

@ -111,7 +111,7 @@ LightTableBar::LightTableBar(TQWidget* parent, int orientation, bool exifRotate)
ThemeEngine::instance()->textSpecialRegColor()); ThemeEngine::instance()->textSpecialRegColor());
painter.end(); painter.end();
if (orientation ==Qt::Vertical) if (orientation ==TQt::Vertical)
setMinimumWidth(d->ratingPixmap.width()*5 + 6 + 2*getMargin()); setMinimumWidth(d->ratingPixmap.width()*5 + 6 + 2*getMargin());
else else
setMinimumHeight(d->ratingPixmap.width()*5 + 6 + 2*getMargin()); setMinimumHeight(d->ratingPixmap.width()*5 + 6 + 2*getMargin());
@ -165,7 +165,7 @@ void LightTableBar::contentsMouseReleaseEvent(TQMouseEvent *e)
RatingPopupMenu *ratingMenu = 0; RatingPopupMenu *ratingMenu = 0;
if (e->button() == Qt::RightButton) if (e->button() == TQt::RightButton)
{ {
TDEPopupMenu popmenu(this); TDEPopupMenu popmenu(this);
@ -460,7 +460,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e)
int cy, cx, ts, y1, y2, x1, x2; int cy, cx, ts, y1, y2, x1, x2;
TQPixmap tile; TQPixmap tile;
if (getOrientation() ==Qt::Vertical) if (getOrientation() ==TQt::Vertical)
{ {
cy = viewportToContents(er.topLeft()).y(); cy = viewportToContents(er.topLeft()).y();
@ -489,7 +489,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e)
for (ThumbBarItem *item = firstItem(); item; item = item->next()) for (ThumbBarItem *item = firstItem(); item; item = item->next())
{ {
if (getOrientation() ==Qt::Vertical) if (getOrientation() ==TQt::Vertical)
{ {
if (y1 <= item->position() && item->position() <= y2) if (y1 <= item->position() && item->position() <= y2)
{ {
@ -603,7 +603,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e)
} }
} }
if (getOrientation() ==Qt::Vertical) if (getOrientation() ==TQt::Vertical)
bitBlt(viewport(), 0, er.y(), &bgPix); bitBlt(viewport(), 0, er.y(), &bgPix);
else else
bitBlt(viewport(), er.x(), 0, &bgPix); bitBlt(viewport(), er.x(), 0, &bgPix);

@ -182,7 +182,7 @@ void LightTableWindow::closeEvent(TQCloseEvent* e)
void LightTableWindow::setupUserArea() void LightTableWindow::setupUserArea()
{ {
TQWidget* mainW = new TQWidget(this); TQWidget* mainW = new TQWidget(this);
d->hSplitter = new TQSplitter(Qt::Horizontal, mainW); d->hSplitter = new TQSplitter(TQt::Horizontal, mainW);
TQHBoxLayout *hlay = new TQHBoxLayout(mainW); TQHBoxLayout *hlay = new TQHBoxLayout(mainW);
d->leftSidebar = new ImagePropertiesSideBarDB(mainW, d->leftSidebar = new ImagePropertiesSideBarDB(mainW,
"LightTable Left Sidebar", d->hSplitter, "LightTable Left Sidebar", d->hSplitter,
@ -190,7 +190,7 @@ void LightTableWindow::setupUserArea()
TQWidget* centralW = new TQWidget(d->hSplitter); TQWidget* centralW = new TQWidget(d->hSplitter);
TQVBoxLayout *vlay = new TQVBoxLayout(centralW); TQVBoxLayout *vlay = new TQVBoxLayout(centralW);
d->vSplitter = new TQSplitter(Qt::Vertical, centralW); d->vSplitter = new TQSplitter(TQt::Vertical, centralW);
d->barView = new LightTableBar(d->vSplitter, ThumbBarView::Horizontal, d->barView = new LightTableBar(d->vSplitter, ThumbBarView::Horizontal,
AlbumSettings::instance()->getExifRotate()); AlbumSettings::instance()->getExifRotate());
d->previewView = new LightTableView(d->vSplitter); d->previewView = new LightTableView(d->vSplitter);

@ -174,7 +174,7 @@ CameraSelection::CameraSelection( TQWidget* parent )
// -------------------------------------------------------------- // --------------------------------------------------------------
TQGroupBox* box2 = new TQGroupBox( 0, Qt::Vertical, plainPage() ); TQGroupBox* box2 = new TQGroupBox( 0, TQt::Vertical, plainPage() );
box2->setFrameStyle( TQFrame::NoFrame ); box2->setFrameStyle( TQFrame::NoFrame );
TQGridLayout* box2Layout = new TQGridLayout( box2->layout(), 1, 5 ); TQGridLayout* box2Layout = new TQGridLayout( box2->layout(), 1, 5 );

@ -166,7 +166,7 @@ SetupCamera::SetupCamera( TQWidget* parent )
{ {
new TQListViewItem(d->listView, ctype->title(), ctype->model(), new TQListViewItem(d->listView, ctype->title(), ctype->model(),
ctype->port(), ctype->path(), ctype->port(), ctype->path(),
ctype->lastAccess().toString(Qt::ISODate)); ctype->lastAccess().toString(TQt::ISODate));
} }
} }
} }
@ -261,7 +261,7 @@ void SetupCamera::slotAutoDetectCamera()
KMessageBox::information(this, i18n("Found camera '%1' (%2) and added it to the list.") KMessageBox::information(this, i18n("Found camera '%1' (%2) and added it to the list.")
.arg(model).arg(port)); .arg(model).arg(port));
new TQListViewItem(d->listView, model, model, port, "/", new TQListViewItem(d->listView, model, model, port, "/",
TQDateTime::currentDateTime().toString(Qt::ISODate)); TQDateTime::currentDateTime().toString(TQt::ISODate));
} }
} }
@ -269,7 +269,7 @@ void SetupCamera::slotAddedCamera(const TQString& title, const TQString& model,
const TQString& port, const TQString& path) const TQString& port, const TQString& path)
{ {
new TQListViewItem(d->listView, title, model, port, path, new TQListViewItem(d->listView, title, model, port, path,
TQDateTime::currentDateTime().toString(Qt::ISODate)); TQDateTime::currentDateTime().toString(TQt::ISODate));
} }
void SetupCamera::slotEditedCamera(const TQString& title, const TQString& model, void SetupCamera::slotEditedCamera(const TQString& title, const TQString& model,
@ -300,7 +300,7 @@ void SetupCamera::applySettings()
TQDateTime lastAccess = TQDateTime::currentDateTime(); TQDateTime lastAccess = TQDateTime::currentDateTime();
if (!item->text(4).isEmpty()) if (!item->text(4).isEmpty())
lastAccess = TQDateTime::fromString(item->text(4), Qt::ISODate); lastAccess = TQDateTime::fromString(item->text(4), TQt::ISODate);
CameraType *ctype = new CameraType(item->text(0), item->text(1), item->text(2), CameraType *ctype = new CameraType(item->text(0), item->text(1), item->text(2),
item->text(3), lastAccess); item->text(3), lastAccess);

@ -166,7 +166,7 @@ SetupGeneral::SetupGeneral(TQWidget* parent, KDialogBase* dialog )
// -------------------------------------------------------- // --------------------------------------------------------
TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), parent); TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), parent);
interfaceOptionsGroup->setColumnLayout(0, Qt::Vertical ); interfaceOptionsGroup->setColumnLayout(0, TQt::Vertical );
interfaceOptionsGroup->layout()->setMargin(KDialog::marginHint()); interfaceOptionsGroup->layout()->setMargin(KDialog::marginHint());
TQGridLayout* ifaceSettingsLayout = new TQGridLayout(interfaceOptionsGroup->layout(), 3, 4, KDialog::spacingHint()); TQGridLayout* ifaceSettingsLayout = new TQGridLayout(interfaceOptionsGroup->layout(), 3, 4, KDialog::spacingHint());

@ -154,7 +154,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
// -------------------------------------------------------- // --------------------------------------------------------
TQGroupBox *colorPolicy = new TQGroupBox(0, Qt::Horizontal, i18n("Color Management Policy"), parent); TQGroupBox *colorPolicy = new TQGroupBox(0, TQt::Horizontal, i18n("Color Management Policy"), parent);
TQGridLayout* grid = new TQGridLayout( colorPolicy->layout(), 1, 2, KDialog::spacingHint()); TQGridLayout* grid = new TQGridLayout( colorPolicy->layout(), 1, 2, KDialog::spacingHint());
d->enableColorManagement = new TQCheckBox(colorPolicy); d->enableColorManagement = new TQCheckBox(colorPolicy);
@ -171,7 +171,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
TQToolTip::add(lcmsLogoLabel, i18n("Visit Little CMS project website")); TQToolTip::add(lcmsLogoLabel, i18n("Visit Little CMS project website"));
d->behaviourGB = new TQVGroupBox(i18n("Behavior"), colorPolicy); d->behaviourGB = new TQVGroupBox(i18n("Behavior"), colorPolicy);
TQButtonGroup *behaviourOptions = new TQButtonGroup(2, Qt::Vertical, d->behaviourGB); TQButtonGroup *behaviourOptions = new TQButtonGroup(2, TQt::Vertical, d->behaviourGB);
behaviourOptions->setFrameStyle( TQFrame::NoFrame ); behaviourOptions->setFrameStyle( TQFrame::NoFrame );
behaviourOptions->setInsideMargin(0); behaviourOptions->setInsideMargin(0);
@ -210,7 +210,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
// -------------------------------------------------------- // --------------------------------------------------------
d->profilesGB = new TQGroupBox(0, Qt::Horizontal, i18n("ICC Profiles Settings"), parent); d->profilesGB = new TQGroupBox(0, TQt::Horizontal, i18n("ICC Profiles Settings"), parent);
TQGridLayout* grid2 = new TQGridLayout( d->profilesGB->layout(), 4, 3, KDialog::spacingHint()); TQGridLayout* grid2 = new TQGridLayout( d->profilesGB->layout(), 4, 3, KDialog::spacingHint());
grid2->setColStretch(2, 10); grid2->setColStretch(2, 10);

@ -78,7 +78,7 @@ SetupIdentity::SetupIdentity(TQWidget* parent )
TQRegExp asciiRx("[\x20-\x7F]+$"); TQRegExp asciiRx("[\x20-\x7F]+$");
TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this));
TQGroupBox *photographerIdGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Photographer and Copyright Information"), parent); TQGroupBox *photographerIdGroup = new TQGroupBox(0, TQt::Horizontal, i18n("Photographer and Copyright Information"), parent);
TQGridLayout* grid = new TQGridLayout( photographerIdGroup->layout(), 1, 1, KDialog::spacingHint()); TQGridLayout* grid = new TQGridLayout( photographerIdGroup->layout(), 1, 1, KDialog::spacingHint());
TQLabel *label1 = new TQLabel(i18n("Author:"), photographerIdGroup); TQLabel *label1 = new TQLabel(i18n("Author:"), photographerIdGroup);
@ -108,7 +108,7 @@ SetupIdentity::SetupIdentity(TQWidget* parent )
// -------------------------------------------------------- // --------------------------------------------------------
TQGroupBox *creditsGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Credit and Copyright"), parent); TQGroupBox *creditsGroup = new TQGroupBox(0, TQt::Horizontal, i18n("Credit and Copyright"), parent);
TQGridLayout* grid2 = new TQGridLayout( creditsGroup->layout(), 2, 1, KDialog::spacingHint()); TQGridLayout* grid2 = new TQGridLayout( creditsGroup->layout(), 2, 1, KDialog::spacingHint());
TQLabel *label3 = new TQLabel(i18n("Credit:"), creditsGroup); TQLabel *label3 = new TQLabel(i18n("Credit:"), creditsGroup);

@ -77,21 +77,21 @@ SetupIOFiles::SetupIOFiles(TQWidget* parent )
//-- JPEG Settings ------------------------------------------------------ //-- JPEG Settings ------------------------------------------------------
d->JPEGOptions = new JPEGSettings(parent); d->JPEGOptions = new JPEGSettings(parent);
KSeparator *line1 = new KSeparator(Qt::Horizontal, parent); KSeparator *line1 = new KSeparator(TQt::Horizontal, parent);
vbox->addWidget(d->JPEGOptions); vbox->addWidget(d->JPEGOptions);
vbox->addWidget(line1); vbox->addWidget(line1);
//-- PNG Settings ------------------------------------------------------- //-- PNG Settings -------------------------------------------------------
d->PNGOptions = new PNGSettings(parent); d->PNGOptions = new PNGSettings(parent);
KSeparator *line2 = new KSeparator(Qt::Horizontal, parent); KSeparator *line2 = new KSeparator(TQt::Horizontal, parent);
vbox->addWidget(d->PNGOptions); vbox->addWidget(d->PNGOptions);
vbox->addWidget(line2); vbox->addWidget(line2);
//-- TIFF Settings ------------------------------------------------------ //-- TIFF Settings ------------------------------------------------------
d->TIFFOptions = new TIFFSettings(parent); d->TIFFOptions = new TIFFSettings(parent);
KSeparator *line3 = new KSeparator(Qt::Horizontal, parent); KSeparator *line3 = new KSeparator(TQt::Horizontal, parent);
vbox->addWidget(d->TIFFOptions); vbox->addWidget(d->TIFFOptions);
vbox->addWidget(line3); vbox->addWidget(line3);

@ -93,7 +93,7 @@ SetupMetadata::SetupMetadata(TQWidget* parent )
// -------------------------------------------------------- // --------------------------------------------------------
TQGroupBox *ExifGroup = new TQGroupBox(1, Qt::Horizontal, i18n("EXIF Actions"), parent); TQGroupBox *ExifGroup = new TQGroupBox(1, TQt::Horizontal, i18n("EXIF Actions"), parent);
d->ExifRotateBox = new TQCheckBox(ExifGroup); d->ExifRotateBox = new TQCheckBox(ExifGroup);
d->ExifRotateBox->setText(i18n("Show images/thumbs &rotated according to orientation tag")); d->ExifRotateBox->setText(i18n("Show images/thumbs &rotated according to orientation tag"));
@ -103,7 +103,7 @@ SetupMetadata::SetupMetadata(TQWidget* parent )
// -------------------------------------------------------- // --------------------------------------------------------
TQGroupBox *IptcGroup = new TQGroupBox(1, Qt::Horizontal, i18n("IPTC Actions"), parent); TQGroupBox *IptcGroup = new TQGroupBox(1, TQt::Horizontal, i18n("IPTC Actions"), parent);
d->saveTagsIptcBox = new TQCheckBox(IptcGroup); d->saveTagsIptcBox = new TQCheckBox(IptcGroup);
d->saveTagsIptcBox->setText(i18n("&Save image tags as \"Keywords\" tag")); d->saveTagsIptcBox->setText(i18n("&Save image tags as \"Keywords\" tag"));
@ -124,7 +124,7 @@ SetupMetadata::SetupMetadata(TQWidget* parent )
// -------------------------------------------------------- // --------------------------------------------------------
TQGroupBox *commonGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Common Metadata Actions"), parent); TQGroupBox *commonGroup = new TQGroupBox(1, TQt::Horizontal, i18n("Common Metadata Actions"), parent);
d->saveCommentsBox = new TQCheckBox(commonGroup); d->saveCommentsBox = new TQCheckBox(commonGroup);
d->saveCommentsBox->setText(i18n("&Save image captions as embedded text")); d->saveCommentsBox->setText(i18n("&Save image captions as embedded text"));

@ -84,7 +84,7 @@ SetupMime::SetupMime(TQWidget* parent )
// -------------------------------------------------------- // --------------------------------------------------------
TQGroupBox *imageFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Image Files"), parent); TQGroupBox *imageFileFilterBox = new TQGroupBox(0, TQt::Horizontal, i18n("Image Files"), parent);
TQGridLayout* grid1 = new TQGridLayout(imageFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); TQGridLayout* grid1 = new TQGridLayout(imageFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel1 = new TQLabel(imageFileFilterBox); TQLabel *logoLabel1 = new TQLabel(imageFileFilterBox);
@ -115,7 +115,7 @@ SetupMime::SetupMime(TQWidget* parent )
// -------------------------------------------------------- // --------------------------------------------------------
TQGroupBox *movieFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Movie Files"), parent); TQGroupBox *movieFileFilterBox = new TQGroupBox(0, TQt::Horizontal, i18n("Movie Files"), parent);
TQGridLayout* grid2 = new TQGridLayout(movieFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); TQGridLayout* grid2 = new TQGridLayout(movieFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel2 = new TQLabel(movieFileFilterBox); TQLabel *logoLabel2 = new TQLabel(movieFileFilterBox);
@ -146,7 +146,7 @@ SetupMime::SetupMime(TQWidget* parent )
// -------------------------------------------------------- // --------------------------------------------------------
TQGroupBox *audioFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Audio Files"), parent); TQGroupBox *audioFileFilterBox = new TQGroupBox(0, TQt::Horizontal, i18n("Audio Files"), parent);
TQGridLayout* grid3 = new TQGridLayout(audioFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); TQGridLayout* grid3 = new TQGridLayout(audioFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel3 = new TQLabel(audioFileFilterBox); TQLabel *logoLabel3 = new TQLabel(audioFileFilterBox);
@ -177,7 +177,7 @@ SetupMime::SetupMime(TQWidget* parent )
// -------------------------------------------------------- // --------------------------------------------------------
TQGroupBox *rawFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("RAW Files"), parent); TQGroupBox *rawFileFilterBox = new TQGroupBox(0, TQt::Horizontal, i18n("RAW Files"), parent);
TQGridLayout* grid4 = new TQGridLayout(rawFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); TQGridLayout* grid4 = new TQGridLayout(rawFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel4 = new TQLabel(rawFileFilterBox); TQLabel *logoLabel4 = new TQLabel(rawFileFilterBox);

@ -598,14 +598,14 @@ void SlideShow::mousePressEvent(TQMouseEvent *e)
if (d->endOfShow) if (d->endOfShow)
close(); close();
if (e->button() == Qt::LeftButton) if (e->button() == TQt::LeftButton)
{ {
d->timer->stop(); d->timer->stop();
d->pause = true; d->pause = true;
d->toolBar->setPaused(true); d->toolBar->setPaused(true);
slotNext(); slotNext();
} }
else if (e->button() == Qt::RightButton && d->fileIndex-1 >= 0) else if (e->button() == TQt::RightButton && d->fileIndex-1 >= 0)
{ {
d->timer->stop(); d->timer->stop();
d->pause = true; d->pause = true;

Loading…
Cancel
Save