summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-11-04 22:55:00 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-11-05 20:54:28 +0900
commit56a89d7bba88bb6ba5d1851a7cc7816fb3fb21d0 (patch)
treede2f4e71d285cda68e02ee2550abe7411b21e678
parent7d370fbcf338c2619833b91701227dcbf773dc4e (diff)
downloaddigikam-56a89d7bba88bb6ba5d1851a7cc7816fb3fb21d0.tar.gz
digikam-56a89d7bba88bb6ba5d1851a7cc7816fb3fb21d0.zip
Replace Qt with TQt
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 1300f2c049587c70b6d619580608d2ec59e120ed)
-rw-r--r--acinclude.m42
-rw-r--r--digikam/digikam/albumdb.cpp24
-rw-r--r--digikam/digikam/albumlister.cpp2
-rw-r--r--digikam/digikam/cameralist.cpp4
-rw-r--r--digikam/digikam/iconview.cpp6
-rw-r--r--digikam/digikam/kdateedit.cpp2
-rw-r--r--digikam/digikam/ratingfilter.cpp4
-rw-r--r--digikam/digikam/scanlib.cpp2
-rw-r--r--digikam/digikam/searchadvanceddialog.cpp6
-rw-r--r--digikam/digikam/searchwidgets.cpp4
-rw-r--r--digikam/digikam/timelineview.cpp14
-rw-r--r--digikam/digikam/timelinewidget.cpp10
-rw-r--r--digikam/imageplugins/coreplugin/iccprooftool.cpp8
-rw-r--r--digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp8
-rw-r--r--digikam/imageplugins/coreplugin/imageeffect_rgb.cpp6
-rw-r--r--digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp4
-rw-r--r--digikam/imageplugins/coreplugin/rgbtool.cpp6
-rw-r--r--digikam/imageplugins/filmgrain/filmgraintool.cpp2
-rw-r--r--digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp2
-rw-r--r--digikam/imageplugins/infrared/imageeffect_infrared.cpp2
-rw-r--r--digikam/imageplugins/infrared/infraredtool.cpp2
-rw-r--r--digikam/imageplugins/inserttext/inserttextwidget.cpp4
-rw-r--r--digikam/imageplugins/perspective/perspectivewidget.cpp4
-rw-r--r--digikam/imageplugins/superimpose/superimposewidget.cpp4
-rw-r--r--digikam/libs/dialogs/imageguidedlg.cpp2
-rw-r--r--digikam/libs/dmetadata/dmetadata.cpp4
-rw-r--r--digikam/libs/imageproperties/cameraitempropertiestab.cpp2
-rw-r--r--digikam/libs/imageproperties/imagepropertiescolorstab.cpp2
-rw-r--r--digikam/libs/imageproperties/imagepropertiestab.cpp4
-rw-r--r--digikam/libs/jpegutils/transupp.cpp20
-rw-r--r--digikam/libs/thumbbar/thumbbar.cpp28
-rw-r--r--digikam/libs/widgets/common/colorgradientwidget.cpp4
-rw-r--r--digikam/libs/widgets/common/curveswidget.cpp4
-rw-r--r--digikam/libs/widgets/common/dcursortracker.cpp2
-rw-r--r--digikam/libs/widgets/common/paniconwidget.cpp4
-rw-r--r--digikam/libs/widgets/common/previewwidget.cpp12
-rw-r--r--digikam/libs/widgets/common/statuszoombar.cpp2
-rw-r--r--digikam/libs/widgets/imageplugins/imageguidewidget.cpp2
-rw-r--r--digikam/libs/widgets/metadata/gpswidget.cpp2
-rw-r--r--digikam/libs/widgets/metadata/worldmapwidget.cpp4
-rw-r--r--digikam/showfoto/showfoto.cpp4
-rw-r--r--digikam/tdeioslave/digikamalbums.cpp14
-rw-r--r--digikam/tdeioslave/digikamdates.cpp2
-rw-r--r--digikam/tdeioslave/digikamsearch.cpp10
-rw-r--r--digikam/themedesigner/mainwindow.cpp2
-rw-r--r--digikam/utilities/batch/imageinfojob.cpp2
-rw-r--r--digikam/utilities/cameragui/cameraui.cpp12
-rw-r--r--digikam/utilities/cameragui/renamecustomizer.cpp12
-rw-r--r--digikam/utilities/imageeditor/canvas/canvas.cpp14
-rw-r--r--digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp4
-rw-r--r--digikam/utilities/imageeditor/canvas/undoaction.cpp8
-rw-r--r--digikam/utilities/imageeditor/tools/imageprint.cpp6
-rw-r--r--digikam/utilities/lighttable/lighttablebar.cpp10
-rw-r--r--digikam/utilities/lighttable/lighttablewindow.cpp4
-rw-r--r--digikam/utilities/setup/cameraselection.cpp2
-rw-r--r--digikam/utilities/setup/setupcamera.cpp8
-rw-r--r--digikam/utilities/setup/setupgeneral.cpp2
-rw-r--r--digikam/utilities/setup/setupicc.cpp6
-rw-r--r--digikam/utilities/setup/setupidentity.cpp4
-rw-r--r--digikam/utilities/setup/setupiofiles.cpp6
-rw-r--r--digikam/utilities/setup/setupmetadata.cpp6
-rw-r--r--digikam/utilities/setup/setupmime.cpp8
-rw-r--r--digikam/utilities/slideshow/slideshow.cpp4
63 files changed, 190 insertions, 190 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 2db09a62..d789b14c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1141,7 +1141,7 @@ fi
if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF
(void)QStyleFactory::create(TQString::null);
- QCursor c(Qt::WhatsThisCursor);
+ QCursor c(TQt::WhatsThisCursor);
EOF
fi
cat >> conftest.$ac_ext <<EOF
diff --git a/digikam/digikam/albumdb.cpp b/digikam/digikam/albumdb.cpp
index ef46b5ae..9b08d5c4 100644
--- a/digikam/digikam/albumdb.cpp
+++ b/digikam/digikam/albumdb.cpp
@@ -323,7 +323,7 @@ AlbumInfo::List AlbumDB::scanAlbums()
++it;
info.url = *it;
++it;
- info.date = TQDate::fromString(*it, Qt::ISODate);
+ info.date = TQDate::fromString(*it, TQt::ISODate);
++it;
info.caption = *it;
++it;
@@ -433,7 +433,7 @@ int AlbumDB::addAlbum(const TQString& url, const TQString& caption,
execSql( TQString("REPLACE INTO Albums (url, date, caption, collection) "
"VALUES('%1', '%2', '%3', '%4');")
.arg(escapeString(url),
- date.toString(Qt::ISODate),
+ date.toString(TQt::ISODate),
escapeString(caption),
escapeString(collection)));
@@ -458,7 +458,7 @@ void AlbumDB::setAlbumCollection(int albumID, const TQString& collection)
void AlbumDB::setAlbumDate(int albumID, const TQDate& date)
{
execSql( TQString("UPDATE Albums SET date='%1' WHERE id=%2;")
- .arg(date.toString(Qt::ISODate))
+ .arg(date.toString(TQt::ISODate))
.arg(albumID) );
}
@@ -766,7 +766,7 @@ TQDateTime AlbumDB::getItemDate(TQ_LLONG imageID)
if (values.isEmpty())
return TQDateTime();
else
- return TQDateTime::fromString(values[0], Qt::ISODate);
+ return TQDateTime::fromString(values[0], TQt::ISODate);
}
TQDateTime AlbumDB::getItemDate(int albumID, const TQString& name)
@@ -782,7 +782,7 @@ TQDateTime AlbumDB::getItemDate(int albumID, const TQString& name)
if (values.isEmpty())
return TQDateTime();
else
- return TQDateTime::fromString(values[0], Qt::ISODate);
+ return TQDateTime::fromString(values[0], TQt::ISODate);
}
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) "
"VALUES ('%1','%2')")
.arg(escapeString(folder),
- TQDateTime::currentDateTime().toString(Qt::ISODate)) );
+ TQDateTime::currentDateTime().toString(TQt::ISODate)) );
albumID = sqlite3_last_insert_rowid(d->dataBase);
} else
albumID = values[0].toInt();
@@ -1046,7 +1046,7 @@ TQ_LLONG AlbumDB::addItem(int albumID,
"( caption , datetime, name, dirid ) "
" VALUES ('%1','%2','%3',%4) " )
.arg(escapeString(comment),
- datetime.toString(Qt::ISODate),
+ datetime.toString(TQt::ISODate),
escapeString(name),
TQString::number(albumID)) );
@@ -1278,7 +1278,7 @@ bool AlbumDB::setItemDate(TQ_LLONG imageID,
{
execSql ( TQString ("UPDATE Images SET datetime='%1'"
"WHERE id=%2;")
- .arg(datetime.toString(Qt::ISODate),
+ .arg(datetime.toString(TQt::ISODate),
TQString::number(imageID)) );
return true;
@@ -1289,7 +1289,7 @@ bool AlbumDB::setItemDate(int albumID, const TQString& name,
{
execSql ( TQString ("UPDATE Images SET datetime='%1'"
"WHERE dirid=%2 AND name='%3';")
- .arg(datetime.toString(Qt::ISODate),
+ .arg(datetime.toString(TQt::ISODate),
TQString::number(albumID),
escapeString(name)) );
@@ -1456,7 +1456,7 @@ TQDate AlbumDB::getAlbumLowestDate(int albumID)
execSql( TQString("SELECT MIN(datetime) FROM Images "
"WHERE dirid=%1 GROUP BY dirid")
.arg( albumID ), &values);
- TQDate itemDate = TQDate::fromString( values[0], Qt::ISODate );
+ TQDate itemDate = TQDate::fromString( values[0], TQt::ISODate );
return itemDate;
}
@@ -1466,7 +1466,7 @@ TQDate AlbumDB::getAlbumHighestDate(int albumID)
execSql( TQString("SELECT MAX(datetime) FROM Images "
"WHERE dirid=%1 GROUP BY dirid")
.arg( albumID ), &values);
- TQDate itemDate = TQDate::fromString( values[0], Qt::ISODate );
+ TQDate itemDate = TQDate::fromString( values[0], TQt::ISODate );
return itemDate;
}
@@ -1482,7 +1482,7 @@ TQDate AlbumDB::getAlbumAverageDate(int albumID)
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())
{
++amountOfImages;
diff --git a/digikam/digikam/albumlister.cpp b/digikam/digikam/albumlister.cpp
index 170d033f..f7b2b4e2 100644
--- a/digikam/digikam/albumlister.cpp
+++ b/digikam/digikam/albumlister.cpp
@@ -618,7 +618,7 @@ void AlbumLister::slotData(TDEIO::Job*, const TQByteArray& data)
}
ImageInfo* info = new ImageInfo(imageID, albumID, name,
- TQDateTime::fromString(date, Qt::ISODate),
+ TQDateTime::fromString(date, TQt::ISODate),
size, dims);
if (matchesFilter(info, foundText))
diff --git a/digikam/digikam/cameralist.cpp b/digikam/digikam/cameralist.cpp
index bed6bcff..6a380e0d 100644
--- a/digikam/digikam/cameralist.cpp
+++ b/digikam/digikam/cameralist.cpp
@@ -113,7 +113,7 @@ bool CameraList::load()
TQDateTime lastAccess = TQDateTime::currentDateTime();
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);
insertPrivate(ctype);
@@ -141,7 +141,7 @@ bool CameraList::save()
elem.setAttribute("model", ctype->model());
elem.setAttribute("port", ctype->port());
elem.setAttribute("path", ctype->path());
- elem.setAttribute("lastaccess", ctype->lastAccess().toString(Qt::ISODate));
+ elem.setAttribute("lastaccess", ctype->lastAccess().toString(TQt::ISODate));
docElem.appendChild(elem);
}
diff --git a/digikam/digikam/iconview.cpp b/digikam/digikam/iconview.cpp
index b76761c6..169e11a4 100644
--- a/digikam/digikam/iconview.cpp
+++ b/digikam/digikam/iconview.cpp
@@ -925,7 +925,7 @@ void IconView::contentsMousePressEvent(TQMouseEvent* e)
d->rubber = 0;
}
- if (e->button() == Qt::RightButton)
+ if (e->button() == TQt::RightButton)
{
IconItem* item = findItem(e->pos());
if (item)
@@ -1125,7 +1125,7 @@ void IconView::contentsMouseMoveEvent(TQMouseEvent* e)
d->toolTipTimer->stop();
slotToolTip();
- if (d->dragging && (e->state() & Qt::LeftButton))
+ if (d->dragging && (e->state() & TQt::LeftButton))
{
if ( (d->dragStartPos - e->pos()).manhattanLength()
> TQApplication::startDragDistance() )
@@ -1240,7 +1240,7 @@ void IconView::contentsMouseReleaseEvent(TQMouseEvent* e)
d->rubber = 0;
}
- if (e->state() == Qt::LeftButton)
+ if (e->state() == TQt::LeftButton)
{
if (d->pressedMoved)
{
diff --git a/digikam/digikam/kdateedit.cpp b/digikam/digikam/kdateedit.cpp
index d0730b4e..688da378 100644
--- a/digikam/digikam/kdateedit.cpp
+++ b/digikam/digikam/kdateedit.cpp
@@ -320,7 +320,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event )
void KDateEdit::mousePressEvent( TQMouseEvent *event )
{
- if ( event->button() == Qt::LeftButton && mDiscardNextMousePress ) {
+ if ( event->button() == TQt::LeftButton && mDiscardNextMousePress ) {
mDiscardNextMousePress = false;
return;
}
diff --git a/digikam/digikam/ratingfilter.cpp b/digikam/digikam/ratingfilter.cpp
index 99006358..fea04682 100644
--- a/digikam/digikam/ratingfilter.cpp
+++ b/digikam/digikam/ratingfilter.cpp
@@ -132,7 +132,7 @@ void RatingFilter::mousePressEvent(TQMouseEvent* e)
d->dirty = false;
- if ( e->button() == Qt::LeftButton || e->button() == Qt::MidButton )
+ if ( e->button() == TQt::LeftButton || e->button() == TQt::MidButton )
{
d->dirty = true;
int pos = e->x() / regPixmapWidth() +1;
@@ -143,7 +143,7 @@ void RatingFilter::mousePressEvent(TQMouseEvent* e)
setRating(pos);
updateRatingTooltip();
}
- else if (e->button() == Qt::RightButton)
+ else if (e->button() == TQt::RightButton)
{
// Show pop-up menu about Rating Filter condition settings
diff --git a/digikam/digikam/scanlib.cpp b/digikam/digikam/scanlib.cpp
index 14781b7d..a94cbed3 100644
--- a/digikam/digikam/scanlib.cpp
+++ b/digikam/digikam/scanlib.cpp
@@ -123,7 +123,7 @@ void ScanLib::startScan()
deleteStaleEntries();
AlbumDB* db = AlbumManager::instance()->albumDB();
- db->setSetting("Scanned", TQDateTime::currentDateTime().toString(Qt::ISODate));
+ db->setSetting("Scanned", TQDateTime::currentDateTime().toString(TQt::ISODate));
}
void ScanLib::findFoldersWhichDoNotExist()
diff --git a/digikam/digikam/searchadvanceddialog.cpp b/digikam/digikam/searchadvanceddialog.cpp
index dff2b555..b545629b 100644
--- a/digikam/digikam/searchadvanceddialog.cpp
+++ b/digikam/digikam/searchadvanceddialog.cpp
@@ -134,7 +134,7 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url)
TQWhatsThis::add(groupbox1, i18n("<p>You can edit the search rules "
"by adding/removing criteria."));
- groupbox1->setColumnLayout(0, Qt::Vertical );
+ groupbox1->setColumnLayout(0, TQt::Vertical );
groupbox1->layout()->setSpacing( KDialog::spacingHint() );
groupbox1->layout()->setMargin( KDialog::marginHint() );
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" );
TQWhatsThis::add(groupbox1, i18n("<p>You can group or ungroup any search criteria "
"from the Search Rule set."));
- groupbox2->setColumnLayout(0, Qt::Vertical);
+ groupbox2->setColumnLayout(0, TQt::Vertical);
groupbox2->layout()->setSpacing( KDialog::spacingHint() );
groupbox2->layout()->setMargin( KDialog::marginHint() );
d->groupButton = new TQPushButton(i18n("&Group"), groupbox2);
@@ -174,7 +174,7 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url)
// box for saving the search.
TQGroupBox *groupbox3 = new TQGroupBox( page, "groupbox3");
- groupbox3->setColumnLayout(0, Qt::Vertical );
+ groupbox3->setColumnLayout(0, TQt::Vertical );
groupbox3->layout()->setSpacing( KDialog::spacingHint() );
groupbox3->setFrameStyle( TQFrame::NoFrame );
TQLabel* label = new TQLabel(i18n("&Save search as: "), groupbox3);
diff --git a/digikam/digikam/searchwidgets.cpp b/digikam/digikam/searchwidgets.cpp
index 6089d549..20609d31 100644
--- a/digikam/digikam/searchwidgets.cpp
+++ b/digikam/digikam/searchwidgets.cpp
@@ -217,7 +217,7 @@ void SearchAdvancedRule::setValues(const KURL& url)
m_lineEdit->setText( value );
if (m_widgetType == DATE)
- m_dateEdit->setDate( TQDate::fromString( value, Qt::ISODate) );
+ m_dateEdit->setDate( TQDate::fromString( value, TQt::ISODate) );
if (m_widgetType == RATING)
{
@@ -448,7 +448,7 @@ TQString SearchAdvancedRule::urlValue() const
string = m_lineEdit->text() ;
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)
string = TQString::number(m_itemsIndexIDMap[ m_valueCombo->currentItem() ]);
diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp
index 4e635239..74156bc4 100644
--- a/digikam/digikam/timelineview.cpp
+++ b/digikam/digikam/timelineview.cpp
@@ -179,7 +179,7 @@ TimeLineView::TimeLineView(TQWidget *parent)
d->timeLineWidget = new TimeLineWidget(panel);
d->scrollBar = new TQScrollBar(panel);
- d->scrollBar->setOrientation(Qt::Horizontal);
+ d->scrollBar->setOrientation(TQt::Horizontal);
d->scrollBar->setMinValue(0);
d->scrollBar->setLineStep(1);
@@ -469,10 +469,10 @@ void TimeLineView::createNewDateSearchAlbum(const TQString& name)
end = (*it).second;
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.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.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++;
}
@@ -529,14 +529,14 @@ void TimeLineView::slotAlbumSelected(SAlbum* salbum)
key = TQString("%1.val").arg(TQString::number(i));
it2 = queries.find(key);
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;
key = TQString("%1.val").arg(TQString::number(i+1));
it2 = queries.find(key);
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;
@@ -546,8 +546,8 @@ void TimeLineView::slotAlbumSelected(SAlbum* salbum)
/*
DateRangeList::iterator it3;
for (it3 = list.begin() ; it3 != list.end(); ++it3)
- DDebug() << (*it3).first.date().toString(Qt::ISODate) << " :: "
- << (*it3).second.date().toString(Qt::ISODate) << endl;
+ DDebug() << (*it3).first.date().toString(TQt::ISODate) << " :: "
+ << (*it3).second.date().toString(TQt::ISODate) << endl;
*/
d->timeLineWidget->setSelectedDateRange(list);
diff --git a/digikam/digikam/timelinewidget.cpp b/digikam/digikam/timelinewidget.cpp
index 46aff0ee..fb195fd8 100644
--- a/digikam/digikam/timelinewidget.cpp
+++ b/digikam/digikam/timelinewidget.cpp
@@ -421,8 +421,8 @@ DateRangeList TimeLineWidget::selectedDateRange(int& totalCount)
/*
for (it = list.begin() ; it != list.end(); ++it)
- DDebug() << (*it).first.date().toString(Qt::ISODate) << " :: "
- << (*it).second.date().toString(Qt::ISODate) << endl;
+ DDebug() << (*it).first.date().toString(TQt::ISODate) << " :: "
+ << (*it).second.date().toString(TQt::ISODate) << 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)
- DDebug() << (*it).first.date().toString(Qt::ISODate) << " :: "
- << (*it).second.date().toString(Qt::ISODate) << endl;
+ DDebug() << (*it).first.date().toString(TQt::ISODate) << " :: "
+ << (*it).second.date().toString(TQt::ISODate) << endl;
*/
return list2;
@@ -1492,7 +1492,7 @@ void TimeLineWidget::wheelEvent(TQWheelEvent* e)
void TimeLineWidget::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
TQPoint pt(e->x(), e->y());
diff --git a/digikam/imageplugins/coreplugin/iccprooftool.cpp b/digikam/imageplugins/coreplugin/iccprooftool.cpp
index 35097d17..a29cb950 100644
--- a/digikam/imageplugins/coreplugin/iccprooftool.cpp
+++ b/digikam/imageplugins/coreplugin/iccprooftool.cpp
@@ -292,7 +292,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
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->setInsideMargin(0);
@@ -318,7 +318,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
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);
KSqueezedTextLabel *make = new KSqueezedTextLabel(0, pictureInfo);
new TQLabel(i18n("Model:"), pictureInfo);
@@ -342,7 +342,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
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->setInsideMargin(0);
@@ -376,7 +376,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
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->setInsideMargin(0);
diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
index cd5e92df..aeea1254 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
@@ -278,7 +278,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
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->setInsideMargin(0);
@@ -304,7 +304,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
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);
KSqueezedTextLabel *make = new KSqueezedTextLabel(0, pictureInfo);
new TQLabel(i18n("Model:"), pictureInfo);
@@ -328,7 +328,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
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->setInsideMargin(0);
@@ -363,7 +363,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
TQGridLayout *thirdPageLayout = new TQGridLayout(proofProfiles, 3, 2,
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->setInsideMargin(0);
diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp
index 0ee78bca..51849599 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp
@@ -148,7 +148,7 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent)
TQLabel *labelLeft = new TQLabel(i18n("Cyan"), gboxSettings);
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->setTickInterval(20);
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->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->setTickInterval(20);
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->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->setTickInterval(20);
TQWhatsThis::add( m_bSlider, i18n("<p>Set here the yellow/blue color adjustment of the image."));
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
index 7baa2ee7..17eaf415 100644
--- a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
+++ b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
@@ -1241,7 +1241,7 @@ void ImageSelectionWidget::placeSelection(TQPoint pm, bool symmetric, TQPoint ce
void ImageSelectionWidget::mousePressEvent ( TQMouseEvent * e )
{
- if ( e->button() == Qt::LeftButton )
+ if ( e->button() == TQt::LeftButton )
{
TQPoint pm = TQPoint(e->x(), e->y());
TQPoint pmVirtual = convertPoint(pm);
@@ -1331,7 +1331,7 @@ void ImageSelectionWidget::mouseReleaseEvent ( TQMouseEvent * )
void ImageSelectionWidget::mouseMoveEvent ( TQMouseEvent * e )
{
- if ( ( e->state() & Qt::LeftButton ) == Qt::LeftButton )
+ if ( ( e->state() & TQt::LeftButton ) == TQt::LeftButton )
{
if ( d->moving )
{
diff --git a/digikam/imageplugins/coreplugin/rgbtool.cpp b/digikam/imageplugins/coreplugin/rgbtool.cpp
index c337d279..457458ff 100644
--- a/digikam/imageplugins/coreplugin/rgbtool.cpp
+++ b/digikam/imageplugins/coreplugin/rgbtool.cpp
@@ -161,7 +161,7 @@ RGBTool::RGBTool(TQObject* parent)
TQLabel *labelLeft = new TQLabel(i18n("Cyan"), m_gboxSettings->plainPage());
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->setTickInterval(20);
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->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->setTickInterval(20);
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->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->setTickInterval(20);
TQWhatsThis::add( m_bSlider, i18n("<p>Set here the yellow/blue color adjustment of the image."));
diff --git a/digikam/imageplugins/filmgrain/filmgraintool.cpp b/digikam/imageplugins/filmgrain/filmgraintool.cpp
index 7bb3aad3..757ed80f 100644
--- a/digikam/imageplugins/filmgrain/filmgraintool.cpp
+++ b/digikam/imageplugins/filmgrain/filmgraintool.cpp
@@ -76,7 +76,7 @@ FilmGrainTool::FilmGrainTool(TQObject* parent)
TQGridLayout* grid = new TQGridLayout( m_gboxSettings->plainPage(), 2, 1);
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->setTickInterval(1);
m_sensibilitySlider->setTickmarks(TQSlider::Below);
diff --git a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
index 25bfc08f..51884798 100644
--- a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
+++ b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
@@ -87,7 +87,7 @@ ImageEffect_FilmGrain::ImageEffect_FilmGrain(TQWidget* parent)
TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 1, 1, 0, spacingHint());
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->setTickInterval(1);
m_sensibilitySlider->setTickmarks(TQSlider::Below);
diff --git a/digikam/imageplugins/infrared/imageeffect_infrared.cpp b/digikam/imageplugins/infrared/imageeffect_infrared.cpp
index 06b6223f..73c52f70 100644
--- a/digikam/imageplugins/infrared/imageeffect_infrared.cpp
+++ b/digikam/imageplugins/infrared/imageeffect_infrared.cpp
@@ -88,7 +88,7 @@ ImageEffect_Infrared::ImageEffect_Infrared(TQWidget* parent)
TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 2, 1, 0, spacingHint());
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->setTickInterval(1);
m_sensibilitySlider->setTickmarks(TQSlider::Below);
diff --git a/digikam/imageplugins/infrared/infraredtool.cpp b/digikam/imageplugins/infrared/infraredtool.cpp
index 6a482c5e..7d1d4323 100644
--- a/digikam/imageplugins/infrared/infraredtool.cpp
+++ b/digikam/imageplugins/infrared/infraredtool.cpp
@@ -78,7 +78,7 @@ InfraredTool::InfraredTool(TQObject* parent)
TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 3, 1);
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->setTickInterval(1);
m_sensibilitySlider->setTickmarks(TQSlider::Below);
diff --git a/digikam/imageplugins/inserttext/inserttextwidget.cpp b/digikam/imageplugins/inserttext/inserttextwidget.cpp
index 214a3cba..dc5b65f4 100644
--- a/digikam/imageplugins/inserttext/inserttextwidget.cpp
+++ b/digikam/imageplugins/inserttext/inserttextwidget.cpp
@@ -574,7 +574,7 @@ void InsertTextWidget::resizeEvent(TQResizeEvent * e)
void InsertTextWidget::mousePressEvent ( TQMouseEvent * e )
{
- if ( e->button() == Qt::LeftButton &&
+ if ( e->button() == TQt::LeftButton &&
m_textRect.contains( e->x(), e->y() ) )
{
m_xpos = e->x();
@@ -594,7 +594,7 @@ void InsertTextWidget::mouseMoveEvent ( TQMouseEvent * e )
{
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 newypos = e->y();
diff --git a/digikam/imageplugins/perspective/perspectivewidget.cpp b/digikam/imageplugins/perspective/perspectivewidget.cpp
index a43aacf5..ae2c5c03 100644
--- a/digikam/imageplugins/perspective/perspectivewidget.cpp
+++ b/digikam/imageplugins/perspective/perspectivewidget.cpp
@@ -675,7 +675,7 @@ void PerspectiveWidget::resizeEvent(TQResizeEvent * e)
void PerspectiveWidget::mousePressEvent ( TQMouseEvent * e )
{
- if ( e->button() == Qt::LeftButton &&
+ if ( e->button() == TQt::LeftButton &&
m_rect.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 )
{
- if ( e->state() == Qt::LeftButton )
+ if ( e->state() == TQt::LeftButton )
{
if ( m_currentResizing != ResizingNone )
{
diff --git a/digikam/imageplugins/superimpose/superimposewidget.cpp b/digikam/imageplugins/superimpose/superimposewidget.cpp
index cc89e8aa..edae15aa 100644
--- a/digikam/imageplugins/superimpose/superimposewidget.cpp
+++ b/digikam/imageplugins/superimpose/superimposewidget.cpp
@@ -243,7 +243,7 @@ bool SuperImposeWidget::zoomSelection(float deltaZoomFactor)
void SuperImposeWidget::mousePressEvent ( TQMouseEvent * e )
{
- if ( isEnabled() && e->button() == Qt::LeftButton &&
+ if ( isEnabled() && e->button() == TQt::LeftButton &&
rect().contains( e->x(), e->y() ) )
{
switch (m_editMode)
@@ -274,7 +274,7 @@ void SuperImposeWidget::mouseMoveEvent ( TQMouseEvent * e )
{
if ( isEnabled() )
{
- if ( e->state() == Qt::LeftButton )
+ if ( e->state() == TQt::LeftButton )
{
switch (m_editMode)
{
diff --git a/digikam/libs/dialogs/imageguidedlg.cpp b/digikam/libs/dialogs/imageguidedlg.cpp
index 9c6c0867..e0fc2314 100644
--- a/digikam/libs/dialogs/imageguidedlg.cpp
+++ b/digikam/libs/dialogs/imageguidedlg.cpp
@@ -212,7 +212,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name,
TQWidget *gboxGuideSettings = new TQWidget(d->settings);
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);
TQLabel *label5 = new TQLabel(i18n("Guide color:"), gboxGuideSettings);
diff --git a/digikam/libs/dmetadata/dmetadata.cpp b/digikam/libs/dmetadata/dmetadata.cpp
index d342b379..bb37506c 100644
--- a/digikam/libs/dmetadata/dmetadata.cpp
+++ b/digikam/libs/dmetadata/dmetadata.cpp
@@ -470,7 +470,7 @@ bool DMetadata::getXMLImageProperties(TQString& comments, TQDateTime& date,
else if (name == TQString::fromLatin1("date"))
{
if (val.isEmpty()) continue;
- date = TQDateTime::fromString(val, Qt::ISODate);
+ date = TQDateTime::fromString(val, TQt::ISODate);
}
else if (name == TQString::fromLatin1("rating"))
{
@@ -516,7 +516,7 @@ bool DMetadata::setXMLImageProperties(const TQString& comments, const TQDateTime
propertiesElem.appendChild(c);
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);
TQDomElement r = xmlDoc.createElement(TQString::fromLatin1("rating"));
diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.cpp b/digikam/libs/imageproperties/cameraitempropertiestab.cpp
index 0427840a..8593e9c7 100644
--- a/digikam/libs/imageproperties/cameraitempropertiestab.cpp
+++ b/digikam/libs/imageproperties/cameraitempropertiestab.cpp
@@ -191,7 +191,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar)
d->newFileName = new TQLabel(i18n("<nobr><b>New Name</b></nobr>:"), 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->make = new TQLabel(i18n("<b>Make</b>:"), d->settingsArea);
d->model = new TQLabel(i18n("<b>Model</b>:"), d->settingsArea);
diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp
index 73884449..a30c69ca 100644
--- a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp
+++ b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp
@@ -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 "
"selected histogram part. These values are available for all "
"channels."));
diff --git a/digikam/libs/imageproperties/imagepropertiestab.cpp b/digikam/libs/imageproperties/imagepropertiestab.cpp
index 952bb64a..7141c039 100644
--- a/digikam/libs/imageproperties/imagepropertiestab.cpp
+++ b/digikam/libs/imageproperties/imagepropertiestab.cpp
@@ -202,7 +202,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
d->owner = new TQLabel(i18n("<b>Owner</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->mime = new TQLabel(i18n("<b>Type</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->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->make = new TQLabel(i18n("<b>Make</b>:"), d->settingsArea);
d->model = new TQLabel(i18n("<b>Model</b>:"), d->settingsArea);
diff --git a/digikam/libs/jpegutils/transupp.cpp b/digikam/libs/jpegutils/transupp.cpp
index 43fe36c4..47a9aa8b 100644
--- a/digikam/libs/jpegutils/transupp.cpp
+++ b/digikam/libs/jpegutils/transupp.cpp
@@ -1625,7 +1625,7 @@ namespace Digikam
* or recompression of the image.
* 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
* fastest option for images larger than main memory.
*
@@ -1660,7 +1660,7 @@ namespace Digikam
LOCAL(void)
do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
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;
int ci, k, offset_y;
@@ -1669,7 +1669,7 @@ do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
JCOEF temp1, temp2;
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
* mirroring by changing the signs of odd-numbered columns.
* 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,
jvirt_barray_ptr *src_coef_arrays,
jvirt_barray_ptr *dst_coef_arrays)
-/*Qt::Vertical flip */
+/* Vertical flip */
{
JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_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)
/* 90 degree rotation is equivalent to
* 1. Transposing the image;
- * 2.Qt::Horizontal mirroring.
+ * 2. Horizontal mirroring.
* 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 *dst_coef_arrays)
/* 270 degree rotation is equivalent to
- * 1.Qt::Horizontal mirroring;
+ * 1. Horizontal mirroring;
* 2. Transposing the image.
* 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 *dst_coef_arrays)
/* 180 degree rotation is equivalent to
- * 1.Qt::Vertical mirroring;
- * 2.Qt::Horizontal mirroring.
+ * 1. Vertical mirroring;
+ * 2. Horizontal mirroring.
* 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;
* 2. Transposition;
* or
- * 1.Qt::Horizontal mirroring;
+ * 1. Horizontal mirroring;
* 2. Transposition;
- * 3.Qt::Horizontal mirroring.
+ * 3. Horizontal mirroring.
* These steps are merged into a single processing routine.
*/
{
diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp
index 2735b7d2..4de25670 100644
--- a/digikam/libs/thumbbar/thumbbar.cpp
+++ b/digikam/libs/thumbbar/thumbbar.cpp
@@ -173,7 +173,7 @@ ThumbBarView::ThumbBarView(TQWidget* parent, int orientation, bool exifRotate,
setFrameStyle(TQFrame::NoFrame);
setAcceptDrops(true);
- if (d->orientation ==Qt::Vertical)
+ if (d->orientation ==TQt::Vertical)
{
setHScrollBarMode(TQScrollView::AlwaysOff);
}
@@ -204,7 +204,7 @@ void ThumbBarView::resizeEvent(TQResizeEvent* e)
TQScrollView::resizeEvent(e);
- if (d->orientation ==Qt::Vertical)
+ if (d->orientation ==TQt::Vertical)
{
d->tileSize = width() - 2*d->margin - verticalScrollBar()->sizeHint().width();
verticalScrollBar()->setLineStep(d->tileSize);
@@ -345,7 +345,7 @@ ThumbBarItem* ThumbBarView::findItem(const TQPoint& pos) const
{
int itemPos;
- if (d->orientation ==Qt::Vertical)
+ if (d->orientation ==TQt::Vertical)
itemPos = pos.y();
else
itemPos = pos.x();
@@ -403,7 +403,7 @@ void ThumbBarView::ensureItemVisible(ThumbBarItem* item)
// We want the complete thumb visible and the next one.
// find the middle of the image and give a margin of 1,5 image
// 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),
0, (int)(d->tileSize*1.5 + 3*d->margin));
else
@@ -455,7 +455,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e)
TQPixmap bgPix, tile;
TQRect er(e->rect());
- if (d->orientation ==Qt::Vertical)
+ if (d->orientation ==TQt::Vertical)
{
cy = viewportToContents(er.topLeft()).y();
@@ -484,7 +484,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e)
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)
{
@@ -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);
else
bitBlt(viewport(), er.x(), 0, &bgPix);
@@ -570,7 +570,7 @@ void ThumbBarView::contentsMouseMoveEvent(TQMouseEvent *e)
{
if (!e) return;
- if (d->dragging && (e->state() & Qt::LeftButton))
+ if (d->dragging && (e->state() & TQt::LeftButton))
{
if ( findItem(d->dragStartPos) &&
(d->dragStartPos - e->pos()).manhattanLength() > TQApplication::startDragDistance() )
@@ -600,14 +600,14 @@ void ThumbBarView::contentsWheelEvent(TQWheelEvent *e)
{
if (e->state() & TQt::ShiftButton)
{
- if (d->orientation ==Qt::Vertical)
+ if (d->orientation ==TQt::Vertical)
scrollBy(0, verticalScrollBar()->pageStep());
else
scrollBy(horizontalScrollBar()->pageStep(), 0);
}
else
{
- if (d->orientation ==Qt::Vertical)
+ if (d->orientation ==TQt::Vertical)
scrollBy(0, verticalScrollBar()->lineStep());
else
scrollBy(horizontalScrollBar()->lineStep(), 0);
@@ -618,14 +618,14 @@ void ThumbBarView::contentsWheelEvent(TQWheelEvent *e)
{
if (e->state() & TQt::ShiftButton)
{
- if (d->orientation ==Qt::Vertical)
+ if (d->orientation ==TQt::Vertical)
scrollBy(0, (-1)*verticalScrollBar()->pageStep());
else
scrollBy((-1)*horizontalScrollBar()->pageStep(), 0);
}
else
{
- if (d->orientation ==Qt::Vertical)
+ if (d->orientation ==TQt::Vertical)
scrollBy(0, (-1)*verticalScrollBar()->lineStep());
else
scrollBy((-1)*horizontalScrollBar()->lineStep(), 0);
@@ -736,7 +736,7 @@ void ThumbBarView::rearrangeItems()
item = item->d->next;
}
- if (d->orientation ==Qt::Vertical)
+ if (d->orientation ==TQt::Vertical)
resizeContents(visibleWidth(), d->count*(d->tileSize+2*d->margin));
else
resizeContents(d->count*(d->tileSize+2*d->margin), visibleHeight());
@@ -763,7 +763,7 @@ void ThumbBarView::repaintItem(ThumbBarItem* item)
{
if (item)
{
- if (d->orientation ==Qt::Vertical)
+ if (d->orientation ==TQt::Vertical)
repaintContents(0, item->d->pos, visibleWidth(), d->tileSize+2*d->margin);
else
repaintContents(item->d->pos, 0, d->tileSize+2*d->margin, visibleHeight());
diff --git a/digikam/libs/widgets/common/colorgradientwidget.cpp b/digikam/libs/widgets/common/colorgradientwidget.cpp
index 9270fd58..df4c96ca 100644
--- a/digikam/libs/widgets/common/colorgradientwidget.cpp
+++ b/digikam/libs/widgets/common/colorgradientwidget.cpp
@@ -61,7 +61,7 @@ ColorGradientWidget::ColorGradientWidget(int o, int size, TQWidget *parent)
setFrameStyle(TQFrame::Box|TQFrame::Plain);
setLineWidth(1);
- if ( d->orientation ==Qt::Horizontal )
+ if ( d->orientation ==TQt::Horizontal )
setFixedHeight( size );
else
setFixedWidth( size );
@@ -105,7 +105,7 @@ void ColorGradientWidget::drawContents(TQPainter *p)
int greenDiff = color2.green() - color1.green();
int blueDiff = color2.blue() - color1.blue();
- if ( d->orientation ==Qt::Vertical )
+ if ( d->orientation ==TQt::Vertical )
{
for ( int y = 0; y < image.height(); y++ )
{
diff --git a/digikam/libs/widgets/common/curveswidget.cpp b/digikam/libs/widgets/common/curveswidget.cpp
index 6409a0b0..d0507789 100644
--- a/digikam/libs/widgets/common/curveswidget.cpp
+++ b/digikam/libs/widgets/common/curveswidget.cpp
@@ -616,7 +616,7 @@ void CurvesWidget::mousePressEvent(TQMouseEvent *e)
int closest_point;
int distance;
- if (e->button() != Qt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted)
+ if (e->button() != TQt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted)
return;
int x = CLAMP((int)(e->pos().x() *
@@ -701,7 +701,7 @@ void CurvesWidget::mouseReleaseEvent(TQMouseEvent *e)
{
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;
setCursor(KCursor::arrowCursor());
diff --git a/digikam/libs/widgets/common/dcursortracker.cpp b/digikam/libs/widgets/common/dcursortracker.cpp
index 951439bf..bf8880c0 100644
--- a/digikam/libs/widgets/common/dcursortracker.cpp
+++ b/digikam/libs/widgets/common/dcursortracker.cpp
@@ -66,7 +66,7 @@ bool DCursorTracker::eventFilter(TQObject *object, TQEvent *e)
{
TQMouseEvent *event = TQT_TQMOUSEEVENT(e);
if (m_enable && (widget->rect().contains(event->pos()) ||
- (event->stateAfter() & Qt::LeftButton)))
+ (event->stateAfter() & TQt::LeftButton)))
{
show();
TQPoint p = widget->mapToGlobal(TQPoint(widget->width()/2, 0));
diff --git a/digikam/libs/widgets/common/paniconwidget.cpp b/digikam/libs/widgets/common/paniconwidget.cpp
index a64ba02a..d5549691 100644
--- a/digikam/libs/widgets/common/paniconwidget.cpp
+++ b/digikam/libs/widgets/common/paniconwidget.cpp
@@ -247,7 +247,7 @@ void PanIconWidget::hideEvent(TQHideEvent *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() ) )
{
d->xpos = e->x();
@@ -261,7 +261,7 @@ void PanIconWidget::mousePressEvent ( TQMouseEvent * e )
void PanIconWidget::mouseMoveEvent ( TQMouseEvent * e )
{
if ( d->moveSelection &&
- (e->state() == Qt::LeftButton || e->state() == Qt::MidButton) )
+ (e->state() == TQt::LeftButton || e->state() == TQt::MidButton) )
{
int newxpos = e->x();
int newypos = e->y();
diff --git a/digikam/libs/widgets/common/previewwidget.cpp b/digikam/libs/widgets/common/previewwidget.cpp
index 9e34d008..0fe5cb29 100644
--- a/digikam/libs/widgets/common/previewwidget.cpp
+++ b/digikam/libs/widgets/common/previewwidget.cpp
@@ -545,16 +545,16 @@ void PreviewWidget::viewportPaintEvent(TQPaintEvent *e)
void PreviewWidget::contentsMousePressEvent(TQMouseEvent *e)
{
- if (!e || e->button() == Qt::RightButton)
+ if (!e || e->button() == TQt::RightButton)
return;
m_movingInProgress = false;
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
emit signalLeftButtonClicked();
}
- else if (e->button() == Qt::MidButton)
+ else if (e->button() == TQt::MidButton)
{
if (visibleWidth() < d->zoomWidth ||
visibleHeight() < d->zoomHeight)
@@ -575,7 +575,7 @@ void PreviewWidget::contentsMouseMoveEvent(TQMouseEvent *e)
{
if (!e) return;
- if (e->state() & Qt::MidButton)
+ if (e->state() & TQt::MidButton)
{
if (m_movingInProgress)
{
@@ -592,14 +592,14 @@ void PreviewWidget::contentsMouseReleaseEvent(TQMouseEvent *e)
m_movingInProgress = false;
- if (e->button() == Qt::MidButton)
+ if (e->button() == TQt::MidButton)
{
emit signalContentsMovedEvent(true);
viewport()->unsetCursor();
viewport()->repaint(false);
}
- if (e->button() == Qt::RightButton)
+ if (e->button() == TQt::RightButton)
{
emit signalRightButtonClicked();
}
diff --git a/digikam/libs/widgets/common/statuszoombar.cpp b/digikam/libs/widgets/common/statuszoombar.cpp
index 047e0a15..bef37de8 100644
--- a/digikam/libs/widgets/common/statuszoombar.cpp
+++ b/digikam/libs/widgets/common/statuszoombar.cpp
@@ -117,7 +117,7 @@ StatusZoomBar::StatusZoomBar(TQWidget *parent)
d->zoomSlider->setMaxValue(ThumbnailSize::Huge);
d->zoomSlider->setPageStep(ThumbnailSize::Step);
d->zoomSlider->setValue(ThumbnailSize::Medium);
- d->zoomSlider->setOrientation(Qt::Horizontal);
+ d->zoomSlider->setOrientation(TQt::Horizontal);
d->zoomSlider->setLineStep(ThumbnailSize::Step);
d->zoomSlider->setMaximumHeight(fontMetrics().height()+2);
d->zoomSlider->setFixedWidth(120);
diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp
index c8d3045d..43ce1048 100644
--- a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp
@@ -496,7 +496,7 @@ void ImageGuideWidget::resizeEvent(TQResizeEvent* 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->focus = true;
diff --git a/digikam/libs/widgets/metadata/gpswidget.cpp b/digikam/libs/widgets/metadata/gpswidget.cpp
index fcb1646e..a7c1f9f7 100644
--- a/digikam/libs/widgets/metadata/gpswidget.cpp
+++ b/digikam/libs/widgets/metadata/gpswidget.cpp
@@ -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->setInsideSpacing(0);
box2->setFrameStyle( TQFrame::NoFrame );
diff --git a/digikam/libs/widgets/metadata/worldmapwidget.cpp b/digikam/libs/widgets/metadata/worldmapwidget.cpp
index 17d07ccb..811e9148 100644
--- a/digikam/libs/widgets/metadata/worldmapwidget.cpp
+++ b/digikam/libs/widgets/metadata/worldmapwidget.cpp
@@ -176,7 +176,7 @@ void WorldMapWidget::drawContents(TQPainter *p, int x, int y, int w, int h)
void WorldMapWidget::contentsMousePressEvent ( TQMouseEvent * e )
{
- if ( e->button() == Qt::LeftButton )
+ if ( e->button() == TQt::LeftButton )
{
d->xMousePos = e->x();
d->yMousePos = e->y();
@@ -191,7 +191,7 @@ void WorldMapWidget::contentsMouseReleaseEvent ( TQMouseEvent * )
void WorldMapWidget::contentsMouseMoveEvent( TQMouseEvent * e )
{
- if ( e->state() == Qt::LeftButton )
+ if ( e->state() == TQt::LeftButton )
{
uint newxpos = e->x();
uint newypos = e->y();
diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp
index f1f1a090..4f1caf20 100644
--- a/digikam/showfoto/showfoto.cpp
+++ b/digikam/showfoto/showfoto.cpp
@@ -430,10 +430,10 @@ void ShowFoto::setupUserArea()
}
else // Horizontal thumbbar layout
{
- m_splitter = new TQSplitter(Qt::Horizontal, widget);
+ m_splitter = new TQSplitter(TQt::Horizontal, widget);
TQWidget* widget2 = new TQWidget(m_splitter);
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_canvas = new Digikam::Canvas(m_stackView);
d->thumbBar = new Digikam::ThumbBarView(d->vSplitter, Digikam::ThumbBarView::Horizontal);
diff --git a/digikam/tdeioslave/digikamalbums.cpp b/digikam/tdeioslave/digikamalbums.cpp
index 31568f03..c16080af 100644
--- a/digikam/tdeioslave/digikamalbums.cpp
+++ b/digikam/tdeioslave/digikamalbums.cpp
@@ -584,7 +584,7 @@ void tdeio_digikamalbums::put(const KURL& url, int permissions, bool overwrite,
// set modification time
const TQString mtimeStr = metaData( "modified" );
if ( !mtimeStr.isEmpty() ) {
- TQDateTime dt = TQDateTime::fromString( mtimeStr, Qt::ISODate );
+ TQDateTime dt = TQDateTime::fromString( mtimeStr, TQt::ISODate );
if ( dt.isValid() ) {
KDE_struct_stat dest_statbuf;
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
m_sqlDB.execSql( TQString("UPDATE Albums SET date='%1', caption='%2', "
"collection='%3', icon=%4 ")
- .arg(srcAlbum.date.toString(Qt::ISODate),
+ .arg(srcAlbum.date.toString(TQt::ISODate),
escapeString(srcAlbum.caption),
escapeString(srcAlbum.collection),
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) "
"VALUES('%1','%2')")
.arg(escapeString(url.path()),
- TQDate::currentDate().toString(Qt::ISODate)) );
+ TQDate::currentDate().toString(TQt::ISODate)) );
if ( permissions != -1 )
{
@@ -1365,7 +1365,7 @@ void tdeio_digikamalbums::buildAlbumList()
++it;
info.url = *it;
++it;
- info.date = TQDate::fromString(*it, Qt::ISODate);
+ info.date = TQDate::fromString(*it, TQt::ISODate);
++it;
info.caption = *it;
++it;
@@ -1403,7 +1403,7 @@ AlbumInfo tdeio_digikamalbums::findAlbum(const TQString& url, bool addIfNotExist
m_sqlDB.execSql(TQString("INSERT INTO Albums (url, date) "
"VALUES('%1', '%2')")
.arg(escapeString(url),
- fi.lastModified().date().toString(Qt::ISODate)));
+ fi.lastModified().date().toString(TQt::ISODate)));
album.id = m_sqlDB.lastInsertedRow();
album.url = url;
@@ -1519,7 +1519,7 @@ void tdeio_digikamalbums::addImage(int albumID, const TQString& filePath)
"VALUES(%1, '%2', '%3', '%4')")
.arg(TQString::number(albumID),
escapeString(TQFileInfo(filePath).fileName()),
- datetime.toString(Qt::ISODate),
+ datetime.toString(TQt::ISODate),
escapeString(comment)));
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) "
"VALUES('%1', '%2')")
.arg(escapeString(*it),
- fi.lastModified().date().toString(Qt::ISODate)));
+ fi.lastModified().date().toString(TQt::ISODate)));
scanAlbum(*it);
}
diff --git a/digikam/tdeioslave/digikamdates.cpp b/digikam/tdeioslave/digikamdates.cpp
index a82e978d..9e7f4e27 100644
--- a/digikam/tdeioslave/digikamdates.cpp
+++ b/digikam/tdeioslave/digikamdates.cpp
@@ -154,7 +154,7 @@ void tdeio_digikamdates::special(const TQByteArray& data)
if ( !matchFilterList( regex, name ) )
continue;
- dateTime = TQDateTime::fromString( dateStr, Qt::ISODate );
+ dateTime = TQDateTime::fromString( dateStr, TQt::ISODate );
if ( !dateTime.isValid() )
continue;
diff --git a/digikam/tdeioslave/digikamsearch.cpp b/digikam/tdeioslave/digikamsearch.cpp
index 3952ae50..225a900f 100644
--- a/digikam/tdeioslave/digikamsearch.cpp
+++ b/digikam/tdeioslave/digikamsearch.cpp
@@ -656,13 +656,13 @@ TQString tdeio_digikamsearch::subQuery(enum tdeio_digikamsearch::SKey key,
// we need to split it into two rules
if (key == IMAGEDATE && op == EQ)
{
- TQDate date = TQDate::fromString(val, Qt::ISODate);
+ TQDate date = TQDate::fromString(val, TQt::ISODate);
if (!date.isValid())
return query;
query = TQString(" (Images.datetime > '%1' AND Images.datetime < '%2') ")
- .arg(date.addDays(-1).toString(Qt::ISODate))
- .arg(date.addDays( 1).toString(Qt::ISODate));
+ .arg(date.addDays(-1).toString(TQt::ISODate))
+ .arg(date.addDays( 1).toString(TQt::ISODate));
}
return query;
@@ -694,11 +694,11 @@ extern "C"
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())
{
exact = true;
- return date.toString(Qt::ISODate);
+ return date.toString(TQt::ISODate);
}
exact = false;
diff --git a/digikam/themedesigner/mainwindow.cpp b/digikam/themedesigner/mainwindow.cpp
index 3b93fb2c..7d00647c 100644
--- a/digikam/themedesigner/mainwindow.cpp
+++ b/digikam/themedesigner/mainwindow.cpp
@@ -81,7 +81,7 @@ MainWindow::MainWindow()
TQGridLayout* layout = new TQGridLayout(this);
TQSplitter* splitter = new TQSplitter(this);
- splitter->setOrientation( Qt::Horizontal );
+ splitter->setOrientation( TQt::Horizontal );
splitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
m_folderView = new FolderView(splitter);
diff --git a/digikam/utilities/batch/imageinfojob.cpp b/digikam/utilities/batch/imageinfojob.cpp
index 9fc5bc3c..5d07c9a0 100644
--- a/digikam/utilities/batch/imageinfojob.cpp
+++ b/digikam/utilities/batch/imageinfojob.cpp
@@ -151,7 +151,7 @@ void ImageInfoJob::slotData(TDEIO::Job*, const TQByteArray& data)
ds >> dims;
ImageInfo* info = new ImageInfo(imageID, albumID, name,
- TQDateTime::fromString(date, Qt::ISODate),
+ TQDateTime::fromString(date, TQt::ISODate),
size, dims);
itemsList.append(info);
diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp
index 302f3ea9..cdabd06c 100644
--- a/digikam/utilities/cameragui/cameraui.cpp
+++ b/digikam/utilities/cameragui/cameraui.cpp
@@ -1142,13 +1142,13 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album)
switch(d->folderDateFormat->currentItem())
{
case CameraUIPriv::TextDateFormat:
- newDirName = dateTime.date().toString(Qt::TextDate);
+ newDirName = dateTime.date().toString(TQt::TextDate);
break;
case CameraUIPriv::LocalDateFormat:
- newDirName = dateTime.date().toString(Qt::LocalDate);
+ newDirName = dateTime.date().toString(TQt::LocalDate);
break;
default: // IsoDateFormat
- newDirName = dateTime.date().toString(Qt::ISODate);
+ newDirName = dateTime.date().toString(TQt::ISODate);
break;
}
}
@@ -1234,13 +1234,13 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album)
switch(d->folderDateFormat->currentItem())
{
case CameraUIPriv::TextDateFormat:
- dirName = dateTime.date().toString(Qt::TextDate);
+ dirName = dateTime.date().toString(TQt::TextDate);
break;
case CameraUIPriv::LocalDateFormat:
- dirName = dateTime.date().toString(Qt::LocalDate);
+ dirName = dateTime.date().toString(TQt::LocalDate);
break;
default: // IsoDateFormat
- dirName = dateTime.date().toString(Qt::ISODate);
+ dirName = dateTime.date().toString(TQt::ISODate);
break;
}
// See B.K.O #136927 : we need to support file system which do not
diff --git a/digikam/utilities/cameragui/renamecustomizer.cpp b/digikam/utilities/cameragui/renamecustomizer.cpp
index 265cfcd4..bc7b4c6d 100644
--- a/digikam/utilities/cameragui/renamecustomizer.cpp
+++ b/digikam/utilities/cameragui/renamecustomizer.cpp
@@ -135,7 +135,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle
setFrameStyle( TQFrame::NoFrame );
setRadioButtonExclusive(true);
- setColumnLayout(0, Qt::Vertical);
+ setColumnLayout(0, TQt::Vertical);
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->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain);
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->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
@@ -178,7 +178,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle
d->renameCustomBox = new TQGroupBox(this);
d->renameCustomBox->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain);
d->renameCustomBox->setInsideMargin(0);
- d->renameCustomBox->setColumnLayout(0, Qt::Vertical);
+ d->renameCustomBox->setColumnLayout(0, TQt::Vertical);
TQGridLayout* renameCustomBoxLayout = new TQGridLayout(d->renameCustomBox->layout(),
6, 2, KDialogBase::spacingHint());
@@ -331,13 +331,13 @@ TQString RenameCustomizer::newName(const TQDateTime &dateTime, int index, const
date = dateTime.toString("yyyyMMddThhmmss");
break;
case RenameCustomizerPriv::TextDateFormat:
- date = dateTime.toString(Qt::TextDate);
+ date = dateTime.toString(TQt::TextDate);
break;
case RenameCustomizerPriv::LocalDateFormat:
- date = dateTime.toString(Qt::LocalDate);
+ date = dateTime.toString(TQt::LocalDate);
break;
case RenameCustomizerPriv::IsoDateFormat:
- date = dateTime.toString(Qt::ISODate);
+ date = dateTime.toString(TQt::ISODate);
break;
case RenameCustomizerPriv::Advanced:
date = dateTime.toString(d->dateTimeFormatString);
diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/digikam/utilities/imageeditor/canvas/canvas.cpp
index 8154c097..09d4a6a9 100644
--- a/digikam/utilities/imageeditor/canvas/canvas.cpp
+++ b/digikam/utilities/imageeditor/canvas/canvas.cpp
@@ -646,12 +646,12 @@ void Canvas::drawRubber()
void Canvas::contentsMousePressEvent(TQMouseEvent *e)
{
- if (!e || e->button() == Qt::RightButton)
+ if (!e || e->button() == TQt::RightButton)
return;
d->midButtonPressed = false;
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
if (d->ltActive || d->rtActive ||
d->lbActive || d->rbActive)
@@ -695,7 +695,7 @@ void Canvas::contentsMousePressEvent(TQMouseEvent *e)
return;
}
}
- else if (e->button() == Qt::MidButton)
+ else if (e->button() == TQt::MidButton)
{
if (visibleWidth() < d->im->width() ||
visibleHeight() < d->im->height())
@@ -733,7 +733,7 @@ void Canvas::contentsMouseMoveEvent(TQMouseEvent *e)
if (!e)
return;
- if (e->state() & Qt::MidButton)
+ if (e->state() & TQt::MidButton)
{
if (d->midButtonPressed)
{
@@ -746,7 +746,7 @@ void Canvas::contentsMouseMoveEvent(TQMouseEvent *e)
if (!d->rubber)
return;
- if (e->state() != Qt::LeftButton &&
+ if (e->state() != TQt::LeftButton &&
!(d->ltActive || d->rtActive ||
d->lbActive || d->rbActive))
return;
@@ -865,12 +865,12 @@ void Canvas::contentsMouseReleaseEvent(TQMouseEvent *e)
emit signalSelected(false);
}
- if (e->button() != Qt::LeftButton)
+ if (e->button() != TQt::LeftButton)
{
viewport()->unsetCursor();
}
- if (e->button() == Qt::RightButton)
+ if (e->button() == TQt::RightButton)
{
emit signalRightButtonClicked();
}
diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
index f81a70db..1d098b22 100644
--- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
+++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
@@ -84,7 +84,7 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview,
TQLabel *embeddedProfileTitle = new TQLabel(i18n("Embedded color profile:"), page);
TQLabel *embeddedProfileDesc = new TQLabel(TQString("<b>%1</b>").arg(m_iccTrans->getEmbeddedProfileDescriptor()), 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())
{
@@ -117,7 +117,7 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview,
vlay->addWidget(logo);
vlay->addWidget(message);
- vlay->addWidget(new KSeparator(Qt::Horizontal, page));
+ vlay->addWidget(new KSeparator(TQt::Horizontal, page));
vlay->addWidget(currentProfileTitle);
vlay->addWidget(currentProfileDesc);
diff --git a/digikam/utilities/imageeditor/canvas/undoaction.cpp b/digikam/utilities/imageeditor/canvas/undoaction.cpp
index dea1a942..bb4ff756 100644
--- a/digikam/utilities/imageeditor/canvas/undoaction.cpp
+++ b/digikam/utilities/imageeditor/canvas/undoaction.cpp
@@ -108,9 +108,9 @@ UndoActionFlip::UndoActionFlip(DImgInterface* iface,
UndoActionFlip::Direction dir)
: UndoAction(iface), m_dir(dir)
{
- if(m_dir ==Qt::Horizontal)
+ if(m_dir ==TQt::Horizontal)
m_title = i18n("Flip Horizontal");
- else if(m_dir ==Qt::Vertical)
+ else if(m_dir ==TQt::Vertical)
m_title = i18n("Flip Vertical");
}
@@ -122,10 +122,10 @@ void UndoActionFlip::rollBack()
{
switch(m_dir)
{
- case Qt::Horizontal:
+ case TQt::Horizontal:
m_iface->flipHoriz(false);
return;
- case Qt::Vertical:
+ case TQt::Vertical:
m_iface->flipVert(false);
return;
default:
diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/digikam/utilities/imageeditor/tools/imageprint.cpp
index 1803a4dd..ece28f6c 100644
--- a/digikam/utilities/imageeditor/tools/imageprint.cpp
+++ b/digikam/utilities/imageeditor/tools/imageprint.cpp
@@ -140,9 +140,9 @@ bool ImagePrint::printImageWithTQt()
// Black & white print ?
if ( m_printer.option( "app-imageeditor-blackwhite" ) != f)
{
- image2Print = image2Print.convertDepth( 1, Qt::MonoOnly |
- Qt::ThresholdDither |
- Qt::AvoidDither );
+ image2Print = image2Print.convertDepth( 1, TQt::MonoOnly |
+ TQt::ThresholdDither |
+ TQt::AvoidDither );
}
TQPainter p;
diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp
index 849706ca..7149018e 100644
--- a/digikam/utilities/lighttable/lighttablebar.cpp
+++ b/digikam/utilities/lighttable/lighttablebar.cpp
@@ -111,7 +111,7 @@ LightTableBar::LightTableBar(TQWidget* parent, int orientation, bool exifRotate)
ThemeEngine::instance()->textSpecialRegColor());
painter.end();
- if (orientation ==Qt::Vertical)
+ if (orientation ==TQt::Vertical)
setMinimumWidth(d->ratingPixmap.width()*5 + 6 + 2*getMargin());
else
setMinimumHeight(d->ratingPixmap.width()*5 + 6 + 2*getMargin());
@@ -165,7 +165,7 @@ void LightTableBar::contentsMouseReleaseEvent(TQMouseEvent *e)
RatingPopupMenu *ratingMenu = 0;
- if (e->button() == Qt::RightButton)
+ if (e->button() == TQt::RightButton)
{
TDEPopupMenu popmenu(this);
@@ -460,7 +460,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e)
int cy, cx, ts, y1, y2, x1, x2;
TQPixmap tile;
- if (getOrientation() ==Qt::Vertical)
+ if (getOrientation() ==TQt::Vertical)
{
cy = viewportToContents(er.topLeft()).y();
@@ -489,7 +489,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e)
for (ThumbBarItem *item = firstItem(); item; item = item->next())
{
- if (getOrientation() ==Qt::Vertical)
+ if (getOrientation() ==TQt::Vertical)
{
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);
else
bitBlt(viewport(), er.x(), 0, &bgPix);
diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp
index 0b77be12..a9988f94 100644
--- a/digikam/utilities/lighttable/lighttablewindow.cpp
+++ b/digikam/utilities/lighttable/lighttablewindow.cpp
@@ -182,7 +182,7 @@ void LightTableWindow::closeEvent(TQCloseEvent* e)
void LightTableWindow::setupUserArea()
{
TQWidget* mainW = new TQWidget(this);
- d->hSplitter = new TQSplitter(Qt::Horizontal, mainW);
+ d->hSplitter = new TQSplitter(TQt::Horizontal, mainW);
TQHBoxLayout *hlay = new TQHBoxLayout(mainW);
d->leftSidebar = new ImagePropertiesSideBarDB(mainW,
"LightTable Left Sidebar", d->hSplitter,
@@ -190,7 +190,7 @@ void LightTableWindow::setupUserArea()
TQWidget* centralW = new TQWidget(d->hSplitter);
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,
AlbumSettings::instance()->getExifRotate());
d->previewView = new LightTableView(d->vSplitter);
diff --git a/digikam/utilities/setup/cameraselection.cpp b/digikam/utilities/setup/cameraselection.cpp
index 2274d878..e1bd9fe6 100644
--- a/digikam/utilities/setup/cameraselection.cpp
+++ b/digikam/utilities/setup/cameraselection.cpp
@@ -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 );
TQGridLayout* box2Layout = new TQGridLayout( box2->layout(), 1, 5 );
diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp
index 214a1df7..f6a3b7b7 100644
--- a/digikam/utilities/setup/setupcamera.cpp
+++ b/digikam/utilities/setup/setupcamera.cpp
@@ -166,7 +166,7 @@ SetupCamera::SetupCamera( TQWidget* parent )
{
new TQListViewItem(d->listView, ctype->title(), ctype->model(),
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.")
.arg(model).arg(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)
{
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,
@@ -300,7 +300,7 @@ void SetupCamera::applySettings()
TQDateTime lastAccess = TQDateTime::currentDateTime();
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),
item->text(3), lastAccess);
diff --git a/digikam/utilities/setup/setupgeneral.cpp b/digikam/utilities/setup/setupgeneral.cpp
index b6fd47b5..0ea33960 100644
--- a/digikam/utilities/setup/setupgeneral.cpp
+++ b/digikam/utilities/setup/setupgeneral.cpp
@@ -166,7 +166,7 @@ SetupGeneral::SetupGeneral(TQWidget* parent, KDialogBase* dialog )
// --------------------------------------------------------
TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), parent);
- interfaceOptionsGroup->setColumnLayout(0, Qt::Vertical );
+ interfaceOptionsGroup->setColumnLayout(0, TQt::Vertical );
interfaceOptionsGroup->layout()->setMargin(KDialog::marginHint());
TQGridLayout* ifaceSettingsLayout = new TQGridLayout(interfaceOptionsGroup->layout(), 3, 4, KDialog::spacingHint());
diff --git a/digikam/utilities/setup/setupicc.cpp b/digikam/utilities/setup/setupicc.cpp
index ecfa7117..fcba0d40 100644
--- a/digikam/utilities/setup/setupicc.cpp
+++ b/digikam/utilities/setup/setupicc.cpp
@@ -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());
d->enableColorManagement = new TQCheckBox(colorPolicy);
@@ -171,7 +171,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
TQToolTip::add(lcmsLogoLabel, i18n("Visit Little CMS project website"));
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->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());
grid2->setColStretch(2, 10);
diff --git a/digikam/utilities/setup/setupidentity.cpp b/digikam/utilities/setup/setupidentity.cpp
index a27c1161..d369038d 100644
--- a/digikam/utilities/setup/setupidentity.cpp
+++ b/digikam/utilities/setup/setupidentity.cpp
@@ -78,7 +78,7 @@ SetupIdentity::SetupIdentity(TQWidget* parent )
TQRegExp asciiRx("[\x20-\x7F]+$");
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());
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());
TQLabel *label3 = new TQLabel(i18n("Credit:"), creditsGroup);
diff --git a/digikam/utilities/setup/setupiofiles.cpp b/digikam/utilities/setup/setupiofiles.cpp
index c8b9891c..6cdf23de 100644
--- a/digikam/utilities/setup/setupiofiles.cpp
+++ b/digikam/utilities/setup/setupiofiles.cpp
@@ -77,21 +77,21 @@ SetupIOFiles::SetupIOFiles(TQWidget* parent )
//-- JPEG Settings ------------------------------------------------------
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(line1);
//-- PNG Settings -------------------------------------------------------
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(line2);
//-- TIFF Settings ------------------------------------------------------
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(line3);
diff --git a/digikam/utilities/setup/setupmetadata.cpp b/digikam/utilities/setup/setupmetadata.cpp
index 3357b1ca..41878bcb 100644
--- a/digikam/utilities/setup/setupmetadata.cpp
+++ b/digikam/utilities/setup/setupmetadata.cpp
@@ -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->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->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->setText(i18n("&Save image captions as embedded text"));
diff --git a/digikam/utilities/setup/setupmime.cpp b/digikam/utilities/setup/setupmime.cpp
index 594dece1..1d54c825 100644
--- a/digikam/utilities/setup/setupmime.cpp
+++ b/digikam/utilities/setup/setupmime.cpp
@@ -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());
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());
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());
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());
TQLabel *logoLabel4 = new TQLabel(rawFileFilterBox);
diff --git a/digikam/utilities/slideshow/slideshow.cpp b/digikam/utilities/slideshow/slideshow.cpp
index 31c6cf28..0983e8c7 100644
--- a/digikam/utilities/slideshow/slideshow.cpp
+++ b/digikam/utilities/slideshow/slideshow.cpp
@@ -598,14 +598,14 @@ void SlideShow::mousePressEvent(TQMouseEvent *e)
if (d->endOfShow)
close();
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
d->timer->stop();
d->pause = true;
d->toolBar->setPaused(true);
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->pause = true;