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

Fix inadvertent tqt changes. Part of an extensive cleanup of various problems

Browse Source 
with kipi-plugins, digikam, and gwenview to resolve bug reports 241, 962, 963.
(cherry picked from commit 207d90d427)
v3.5.13-sru
Darrell Anderson 13 years ago committed by Slávek Banko
parent d35605b420
commit 3cf300077a
10 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File

16
digikam/digikam/albumdb.cpp
Unescape View File

@ -144,7 +144,7 @@ void AlbumDB::initDB()
{
if (!execSql( TQString("CREATE TABLE Albums\n"
" (id INTEGER PRIMARY KEY,\n"
" url TEXT NOT NULL UNITQUE,\n"
" url TEXT NOT NULL UNIQUE,\n"
" date DATE NOT NULL,\n"
" caption TEXT,\n"
" collection TEXT,\n"
@ -159,7 +159,7 @@ void AlbumDB::initDB()
" name TEXT NOT NULL,\n"
" icon INTEGER,\n"
" iconkde TEXT,\n"
" UNITQUE (name, pid));") ))
" UNIQUE (name, pid));") ))
{
return;
}
@ -167,7 +167,7 @@ void AlbumDB::initDB()
if (!execSql( TQString("CREATE TABLE TagsTree\n"
" (id INTEGER NOT NULL,\n"
" pid INTEGER NOT NULL,\n"
" UNITQUE (id, pid));") ))
" UNIQUE (id, pid));") ))
{
return;
}
@ -178,7 +178,7 @@ void AlbumDB::initDB()
" dirid INTEGER NOT NULL,\n"
" caption TEXT,\n"
" datetime DATETIME,\n"
" UNITQUE (name, dirid));") ))
" UNIQUE (name, dirid));") ))
{
return;
}
@ -187,7 +187,7 @@ void AlbumDB::initDB()
if (!execSql( TQString("CREATE TABLE ImageTags\n"
" (imageid INTEGER NOT NULL,\n"
" tagid INTEGER NOT NULL,\n"
" UNITQUE (imageid, tagid));") ))
" UNIQUE (imageid, tagid));") ))
{
return;
}
@ -196,21 +196,21 @@ void AlbumDB::initDB()
" (imageid INTEGER NOT NULL,\n"
" property TEXT NOT NULL,\n"
" value TEXT NOT NULL,\n"
" UNITQUE (imageid, property));") ))
" UNIQUE (imageid, property));") ))
{
return;
}
if ( !execSql( TQString( "CREATE TABLE Searches \n"
" (id INTEGER PRIMARY KEY, \n"
" name TEXT NOT NULL UNITQUE, \n"
" name TEXT NOT NULL UNIQUE, \n"
" url TEXT NOT NULL);" ) ) )
{
return;
}
if (!execSql( TQString("CREATE TABLE Settings \n"
"(keyword TEXT NOT NULL UNITQUE,\n"
"(keyword TEXT NOT NULL UNIQUE,\n"
" value TEXT);") ))
return;
else

4
digikam/digikam/albumiconview.cpp
Unescape View File

@ -1863,11 +1863,11 @@ void AlbumIconView::slotSetExifOrientation( int orientation )
KURL::List::Iterator it;
float cnt = (float)urlList.count();
emit signalProgressBarMode(StatusProgressBar::ProgressBarMode,
i18n("Revising Exif Qt::Orientation tags. Please wait..."));
i18n("Revising Exif Orientation tags. Please wait..."));
for( it = urlList.begin(); it != urlList.end(); ++it )
{
DDebug() << "Setting Exif Qt::Orientation tag to " << orientation << endl;
DDebug() << "Setting Exif Orientation tag to " << orientation << endl;
DMetadata metadata((*it).path());
DMetadata::ImageOrientation o = (DMetadata::ImageOrientation)orientation;

4
digikam/digikam/digikamapp.cpp
Unescape View File

@ -789,7 +789,7 @@ void DigikamApp::setupActions()
0,
actionCollection(),
"image_set_exif_orientation_normal");
d->imageSetExifOrientation2Action = new KAction(i18n("FlippedQt::Horizontally"),
d->imageSetExifOrientation2Action = new KAction(i18n("Flipped Horizontally"),
0,
d->imageExifOrientationActionMenu,
0,
@ -801,7 +801,7 @@ void DigikamApp::setupActions()
0,
actionCollection(),
"image_set_exif_orientation_rotated_upside_down");
d->imageSetExifOrientation4Action = new KAction(i18n("FlippedQt::Vertically"),
d->imageSetExifOrientation4Action = new KAction(i18n("Flipped Vertically"),
0,
d->imageExifOrientationActionMenu,
0,

8
digikam/digikam/folderview.cpp
Unescape View File

@ -172,7 +172,7 @@ void FolderView::contentsMouseMoveEvent(TQMouseEvent *e)
{
TQListView::contentsMouseMoveEvent(e);
if(e->state() == Qt::NoButton)
if(e->state() == NoButton)
{
if(KGlobalSettings::changeCursorOverIcon())
{
@ -207,7 +207,7 @@ void FolderView::contentsMousePressEvent(TQMouseEvent *e)
// With Check Box item, we will toggle on/off item using middle mouse button.
// See B.K.O #130906
FolderCheckListItem *citem = dynamic_cast<FolderCheckListItem*>(item);
if(citem && e->button() == Qt::MidButton && mouseInItemRect(item, e->pos().x()))
if(citem && e->button() == MidButton && mouseInItemRect(item, e->pos().x()))
{
TQListView::contentsMousePressEvent(e);
citem->setOn(!citem->isOn());
@ -216,7 +216,7 @@ void FolderView::contentsMousePressEvent(TQMouseEvent *e)
TQListView::contentsMousePressEvent(e);
if(item && e->button() == Qt::LeftButton)
if(item && e->button() == LeftButton)
{
// Prepare D&D if necessary
d->dragStartPos = e->pos();
@ -232,7 +232,7 @@ void FolderView::contentsMouseReleaseEvent(TQMouseEvent *e)
TQListView::contentsMouseReleaseEvent(e);
if(item && e->button() == Qt::LeftButton)
if(item && e->button() == LeftButton)
{
// See B.K.O #126871: collapse/expand treeview using left mouse button single click.
if (mouseInItemRect(item, e->pos().x()))

2
digikam/digikam/iconview.cpp
Unescape View File

@ -1076,7 +1076,7 @@ void IconView::drawRubber(TQPainter* p)
void IconView::contentsMouseMoveEvent(TQMouseEvent* e)
{
if (e->state() == Qt::NoButton)
if (e->state() == NoButton)
{
IconItem* item = findItem(e->pos());

2
digikam/digikam/imagepreviewview.cpp
Unescape View File

@ -130,7 +130,7 @@ ImagePreviewView::ImagePreviewView(AlbumWidgetStack *parent)
d = new ImagePreviewViewPriv;
d->parent = parent;
// get preview size from screen size, but limit from VGA to WTQXGA
// get preview size from screen size, but limit from VGA to WQXGA
d->previewSize = TQMAX(KApplication::desktop()->height(),
KApplication::desktop()->width());
if (d->previewSize < 640)

6
digikam/digikam/searchquickdialog.h
Unescape View File

@ -24,8 +24,8 @@
/** @file searchquickdialog.h */
#ifndef SEARCHTQUICKDIALOG_H
#define SEARCHTQUICKDIALOG_H
#ifndef SEARCHQUICKDIALOG_H
#define SEARCHQUICKDIALOG_H
// TQt includes.
@ -85,4 +85,4 @@ private:
} // namespace Digikam
#endif /* SEARCHTQUICKDIALOG_H */
#endif /* SEARCHQUICKDIALOG_H */

2
digikam/digikam/tageditdlg.cpp
Unescape View File

@ -110,7 +110,7 @@ TagEditDlg::TagEditDlg(TQWidget *parent, TAlbum* album, bool create)
d->topLabel = new TQLabel(page);
d->topLabel->setAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine);
KSeparator *line = new KSeparator(Qt::Horizontal, page);
KSeparator *line = new KSeparator (Horizontal, page);
// --------------------------------------------------------

8
digikam/digikam/timelinewidget.cpp
Unescape View File

@ -688,9 +688,9 @@ void TimeLineWidget::updatePixmap()
if (sel == Selected || sel == FuzzySelection)
{
selBrush.setColor(ThemeEngine::instance()->thumbSelColor());
selBrush.setStyle(Qt::SolidPattern);
selBrush.setStyle(TQBrush::SolidPattern);
if (sel == FuzzySelection)
selBrush.setStyle(Qt::Dense4Pattern);
selBrush.setStyle(TQBrush::Dense4Pattern);
selRect.setTop(height() - d->bottomMargin + 1);
selRect.setLeft(d->startPos + i*d->barWidth);
@ -872,9 +872,9 @@ void TimeLineWidget::updatePixmap()
if (sel == Selected || sel == FuzzySelection)
{
selBrush.setColor(ThemeEngine::instance()->thumbSelColor());
selBrush.setStyle(Qt::SolidPattern);
selBrush.setStyle(TQBrush::SolidPattern);
if (sel == FuzzySelection)
selBrush.setStyle(Qt::Dense4Pattern);
selBrush.setStyle(TQBrush::Dense4Pattern);
selRect.setTop(height() - d->bottomMargin + 1);
selRect.setLeft(d->startPos - (i+1)*d->barWidth);

6
digikam/utilities/cameragui/mtqueue.h
Unescape View File

@ -21,8 +21,8 @@
*
* ============================================================ */
#ifndef COMMAND_TQUEUE_H
#define COMMAND_TQUEUE_H
#ifndef COMMAND_QUEUE_H
#define COMMAND_QUEUE_H
// TQt includes.
@ -113,4 +113,4 @@ private:
} // namespace Digikam
#endif // COMMAND_TQUEUE_H
#endif // COMMAND_QUEUE_H

Write Preview
Loading…
Cancel
Save