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.
pull/1/head
Darrell Anderson 12 years ago
parent 0f64ac7c10
commit 207d90d427
55 changed files with 29 additions and 77 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

1
digikam/digikam/albumfolderview.h
Unescape View File

@ -50,7 +50,6 @@ class AlbumFolderViewPriv;
class AlbumFolderView : public FolderView
{
Q_OBJECT
public:

1
digikam/digikam/albumhistory.h
Unescape View File

@ -47,7 +47,6 @@ class HistoryItem;
class AlbumHistory : public TQObject
{
Q_OBJECT
public:

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;

1
digikam/digikam/albumiconview.h
Unescape View File

@ -63,7 +63,6 @@ class AlbumIconView : public IconView,
public AlbumItemHandler
{
Q_OBJECT
public:

1
digikam/digikam/albumiconviewfilter.h
Unescape View File

@ -44,7 +44,6 @@ class AlbumIconViewFilterPriv;
class AlbumIconViewFilter : public TQHBox
{
Q_OBJECT
public:

1
digikam/digikam/albumlister.h
Unescape View File

@ -60,7 +60,6 @@ class AlbumListerPriv;
class AlbumLister : public TQObject
{
Q_OBJECT
public:

1
digikam/digikam/albummanager.h
Unescape View File

@ -87,7 +87,6 @@ typedef TQPair<int, int> YearMonth;
class DIGIKAM_EXPORT AlbumManager : public TQObject
{
Q_OBJECT
public:

1
digikam/digikam/albumpropsedit.h
Unescape View File

@ -45,7 +45,6 @@ class AlbumPropsEditPriv;
class AlbumPropsEdit : public KDialogBase
{
Q_OBJECT
public:

1
digikam/digikam/albumthumbnailloader.h
Unescape View File

@ -46,7 +46,6 @@ class AlbumThumbnailLoaderPrivate;
class AlbumThumbnailLoader : public TQObject
{
Q_OBJECT
public:

1
digikam/digikam/albumwidgetstack.h
Unescape View File

@ -48,7 +48,6 @@ class AlbumWidgetStackPriv;
class DIGIKAM_EXPORT AlbumWidgetStack : public TQWidgetStack
{
Q_OBJECT
public:

1
digikam/digikam/cameralist.h
Unescape View File

@ -41,7 +41,6 @@ class CameraListPrivate;
class CameraList : public TQObject
{
Q_OBJECT
public:

1
digikam/digikam/datefolderview.h
Unescape View File

@ -45,7 +45,6 @@ class DAlbum;
class DateFolderView : public TQVBox
{
Q_OBJECT
public:

1
digikam/digikam/dcopiface.h
Unescape View File

@ -45,7 +45,6 @@ class DCOPIface : public TQObject, public DCOPObject
{
K_DCOP
Q_OBJECT
//
public:

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,

1
digikam/digikam/digikamapp.h
Unescape View File

@ -55,7 +55,6 @@ class DigikamAppPriv;
class DIGIKAM_EXPORT DigikamApp : public KMainWindow
{
Q_OBJECT
public:

1
digikam/digikam/digikamfirstrun.h
Unescape View File

@ -44,7 +44,6 @@ class FirstRunWidget;
class DIGIKAM_EXPORT DigikamFirstRun : public KDialogBase
{
Q_OBJECT
public:

1
digikam/digikam/digikamview.h
Unescape View File

@ -47,7 +47,6 @@ class DigikamViewPriv;
class DigikamView : public TQHBox
{
Q_OBJECT
public:

1
digikam/digikam/dio_p.h
Unescape View File

@ -39,7 +39,6 @@ namespace DIO
class Watch : public TQObject
{
Q_OBJECT
public:

1
digikam/digikam/firstrun.h
Unescape View File

@ -42,7 +42,6 @@ namespace Digikam
class DIGIKAM_EXPORT FirstRunWidget : public TQWidget
{
Q_OBJECT
public:

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()))

1
digikam/digikam/folderview.h
Unescape View File

@ -51,7 +51,6 @@ class FolderItem;
class DIGIKAM_EXPORT FolderView : public TQListView
{
Q_OBJECT
public:

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());

1
digikam/digikam/iconview.h
Unescape View File

@ -49,7 +49,6 @@ class IconViewPriv;
class DIGIKAM_EXPORT IconView : public TQScrollView
{
Q_OBJECT
public:

1
digikam/digikam/imageattributeswatch.h
Unescape View File

@ -38,7 +38,6 @@ namespace Digikam
class ImageAttributesWatch : public TQObject
{
Q_OBJECT
public:

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)

1
digikam/digikam/imagepreviewview.h
Unescape View File

@ -49,7 +49,6 @@ class DIGIKAM_EXPORT ImagePreviewView : public PreviewWidget
{
Q_OBJECT
public:

1
digikam/digikam/kdateedit.h
Unescape View File

@ -56,7 +56,6 @@ namespace Digikam
class KDateEdit : public TQComboBox
{
Q_OBJECT
public:

1
digikam/digikam/kdatepickerpopup.h
Unescape View File

@ -56,7 +56,6 @@ namespace Digikam
class KDatePickerPopup: public TQPopupMenu
{
Q_OBJECT
public:

1
digikam/digikam/kdatetimeedit.h
Unescape View File

@ -49,7 +49,6 @@ class KDateEdit;
class KDateTimeEdit : public TQHBox
{
Q_OBJECT
public:

1
digikam/digikam/kipiinterface.h
Unescape View File

@ -154,7 +154,6 @@ private:
class DigikamKipiInterface : public KIPI::Interface
{
Q_OBJECT
public:

1
digikam/digikam/mediaplayerview.h
Unescape View File

@ -44,7 +44,6 @@ class MediaPlayerViewPriv;
class DIGIKAM_EXPORT MediaPlayerView : public TQWidgetStack
{
Q_OBJECT
public:

1
digikam/digikam/mimefilter.h
Unescape View File

@ -36,7 +36,6 @@ class MimeFilterPriv;
class MimeFilter : public TQComboBox
{
Q_OBJECT
public:

1
digikam/digikam/monthwidget.h
Unescape View File

@ -40,7 +40,6 @@ class MonthWidgetPriv;
class MonthWidget : public TQFrame
{
Q_OBJECT
public:

1
digikam/digikam/pixmapmanager.h
Unescape View File

@ -50,7 +50,6 @@ class PixmapManagerPriv;
class PixmapManager : public TQObject
{
Q_OBJECT
public:

1
digikam/digikam/ratingfilter.h
Unescape View File

@ -38,7 +38,6 @@ class RatingFilterPriv;
class RatingFilter : public RatingWidget
{
Q_OBJECT
public:

1
digikam/digikam/ratingpopupmenu.h
Unescape View File

@ -36,7 +36,6 @@ class RatingPopupMenuPriv;
class RatingPopupMenu : public TQPopupMenu
{
Q_OBJECT
public:

1
digikam/digikam/ratingwidget.h
Unescape View File

@ -37,7 +37,6 @@ class RatingWidgetPriv;
class RatingWidget : public TQWidget
{
Q_OBJECT
public:

1
digikam/digikam/searchadvanceddialog.h
Unescape View File

@ -51,7 +51,6 @@ class SearchAdvancedDialogPriv;
class SearchAdvancedDialog : public KDialogBase
{
Q_OBJECT
public:

1
digikam/digikam/searchfolderview.h
Unescape View File

@ -38,7 +38,6 @@ class SearchFolderItem;
class SearchFolderView : public FolderView
{
Q_OBJECT
public:

7
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.
@ -51,7 +51,6 @@ class SearchQuickDialogPriv;
class SearchQuickDialog : public KDialogBase
{
Q_OBJECT
public:
@ -85,4 +84,4 @@ private:
} // namespace Digikam
#endif /* SEARCHTQUICKDIALOG_H */
#endif /* SEARCHQUICKDIALOG_H */

1
digikam/digikam/searchresultsview.h
Unescape View File

@ -52,7 +52,6 @@ class SearchResultsViewPriv;
class SearchResultsView : public TQIconView
{
Q_OBJECT
public:

3
digikam/digikam/searchwidgets.h
Unescape View File

@ -54,7 +54,6 @@ class SqueezedComboBox;
class SearchRuleLabel: public TQLabel
{
Q_OBJECT
public:
@ -95,7 +94,6 @@ private:
class SearchAdvancedBase : public TQObject
{
Q_OBJECT
public:
@ -196,7 +194,6 @@ class SearchAdvancedGroup;
class SearchAdvancedRule : public SearchAdvancedBase
{
Q_OBJECT
public:
/**

1
digikam/digikam/syncjob.h
Unescape View File

@ -55,7 +55,6 @@ class TAlbum;
class SyncJob : public TQObject
{
Q_OBJECT
public:

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);
// --------------------------------------------------------

1
digikam/digikam/tageditdlg.h
Unescape View File

@ -45,7 +45,6 @@ class TagEditDlgPriv;
class TagEditDlg : public KDialogBase
{
Q_OBJECT
public:

1
digikam/digikam/tagfilterview.h
Unescape View File

@ -40,7 +40,6 @@ class TagFilterViewPrivate;
class TagFilterView : public FolderView
{
Q_OBJECT
public:

1
digikam/digikam/tagfolderview.h
Unescape View File

@ -44,7 +44,6 @@ class TagFolderViewPriv;
class TagFolderView : public FolderView
{
Q_OBJECT
public:

1
digikam/digikam/tagspopupmenu.h
Unescape View File

@ -39,7 +39,6 @@ class TagsPopupMenuPriv;
class TagsPopupMenu : public TQPopupMenu
{
Q_OBJECT
public:

1
digikam/digikam/timelinefolderview.h
Unescape View File

@ -38,7 +38,6 @@ class TimeLineFolderItem;
class TimeLineFolderView : public FolderView
{
Q_OBJECT
public:

1
digikam/digikam/timelineview.h
Unescape View File

@ -41,7 +41,6 @@ class TimeLineViewPriv;
class TimeLineView : public TQWidget
{
Q_OBJECT
public:

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);

1
digikam/digikam/timelinewidget.h
Unescape View File

@ -45,7 +45,6 @@ class TimeLineWidgetPriv;
class TimeLineWidget : public TQWidget
{
Q_OBJECT
public:

1
digikam/digikam/welcomepageview.h
Unescape View File

@ -43,7 +43,6 @@ namespace Digikam
class DIGIKAM_EXPORT WelcomePageView : public KHTMLPart
{
Q_OBJECT
public:

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