diff options
55 files changed, 29 insertions, 77 deletions
diff --git a/digikam/digikam/albumdb.cpp b/digikam/digikam/albumdb.cpp index a2aba013..b4414dc0 100644 --- a/digikam/digikam/albumdb.cpp +++ b/digikam/digikam/albumdb.cpp @@ -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 diff --git a/digikam/digikam/albumfolderview.h b/digikam/digikam/albumfolderview.h index 553fd09b..0a9a47d4 100644 --- a/digikam/digikam/albumfolderview.h +++ b/digikam/digikam/albumfolderview.h @@ -50,7 +50,6 @@ class AlbumFolderViewPriv; class AlbumFolderView : public FolderView { Q_OBJECT - public: diff --git a/digikam/digikam/albumhistory.h b/digikam/digikam/albumhistory.h index ed3a5db2..18d0d986 100644 --- a/digikam/digikam/albumhistory.h +++ b/digikam/digikam/albumhistory.h @@ -47,7 +47,6 @@ class HistoryItem; class AlbumHistory : public TQObject { Q_OBJECT - public: diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp index adb0f2ef..7dcfa650 100644 --- a/digikam/digikam/albumiconview.cpp +++ b/digikam/digikam/albumiconview.cpp @@ -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; diff --git a/digikam/digikam/albumiconview.h b/digikam/digikam/albumiconview.h index c4518fff..d29cd490 100644 --- a/digikam/digikam/albumiconview.h +++ b/digikam/digikam/albumiconview.h @@ -63,7 +63,6 @@ class AlbumIconView : public IconView, public AlbumItemHandler { Q_OBJECT - public: diff --git a/digikam/digikam/albumiconviewfilter.h b/digikam/digikam/albumiconviewfilter.h index 8f6d3cb7..c001319d 100644 --- a/digikam/digikam/albumiconviewfilter.h +++ b/digikam/digikam/albumiconviewfilter.h @@ -44,7 +44,6 @@ class AlbumIconViewFilterPriv; class AlbumIconViewFilter : public TQHBox { Q_OBJECT - public: diff --git a/digikam/digikam/albumlister.h b/digikam/digikam/albumlister.h index d8641806..c345a756 100644 --- a/digikam/digikam/albumlister.h +++ b/digikam/digikam/albumlister.h @@ -60,7 +60,6 @@ class AlbumListerPriv; class AlbumLister : public TQObject { Q_OBJECT - public: diff --git a/digikam/digikam/albummanager.h b/digikam/digikam/albummanager.h index f0f98bbf..e85e216c 100644 --- a/digikam/digikam/albummanager.h +++ b/digikam/digikam/albummanager.h @@ -87,7 +87,6 @@ typedef TQPair<int, int> YearMonth; class DIGIKAM_EXPORT AlbumManager : public TQObject { Q_OBJECT - public: diff --git a/digikam/digikam/albumpropsedit.h b/digikam/digikam/albumpropsedit.h index 9e0cbd66..55c9bba7 100644 --- a/digikam/digikam/albumpropsedit.h +++ b/digikam/digikam/albumpropsedit.h @@ -45,7 +45,6 @@ class AlbumPropsEditPriv; class AlbumPropsEdit : public KDialogBase { Q_OBJECT - public: diff --git a/digikam/digikam/albumthumbnailloader.h b/digikam/digikam/albumthumbnailloader.h index b8da30af..f126207d 100644 --- a/digikam/digikam/albumthumbnailloader.h +++ b/digikam/digikam/albumthumbnailloader.h @@ -46,7 +46,6 @@ class AlbumThumbnailLoaderPrivate; class AlbumThumbnailLoader : public TQObject { Q_OBJECT - public: diff --git a/digikam/digikam/albumwidgetstack.h b/digikam/digikam/albumwidgetstack.h index eded30c5..edeb735a 100644 --- a/digikam/digikam/albumwidgetstack.h +++ b/digikam/digikam/albumwidgetstack.h @@ -48,7 +48,6 @@ class AlbumWidgetStackPriv; class DIGIKAM_EXPORT AlbumWidgetStack : public TQWidgetStack { Q_OBJECT - public: diff --git a/digikam/digikam/cameralist.h b/digikam/digikam/cameralist.h index 6d2941ce..7e25d98f 100644 --- a/digikam/digikam/cameralist.h +++ b/digikam/digikam/cameralist.h @@ -41,7 +41,6 @@ class CameraListPrivate; class CameraList : public TQObject { Q_OBJECT - public: diff --git a/digikam/digikam/datefolderview.h b/digikam/digikam/datefolderview.h index 24371633..f213ba12 100644 --- a/digikam/digikam/datefolderview.h +++ b/digikam/digikam/datefolderview.h @@ -45,7 +45,6 @@ class DAlbum; class DateFolderView : public TQVBox { Q_OBJECT - public: diff --git a/digikam/digikam/dcopiface.h b/digikam/digikam/dcopiface.h index fa08ab42..b203eb9b 100644 --- a/digikam/digikam/dcopiface.h +++ b/digikam/digikam/dcopiface.h @@ -45,7 +45,6 @@ class DCOPIface : public TQObject, public DCOPObject { K_DCOP Q_OBJECT -// public: diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp index b5db6001..93366ee9 100644 --- a/digikam/digikam/digikamapp.cpp +++ b/digikam/digikam/digikamapp.cpp @@ -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, diff --git a/digikam/digikam/digikamapp.h b/digikam/digikam/digikamapp.h index 7a10e37d..6774f914 100644 --- a/digikam/digikam/digikamapp.h +++ b/digikam/digikam/digikamapp.h @@ -55,7 +55,6 @@ class DigikamAppPriv; class DIGIKAM_EXPORT DigikamApp : public KMainWindow { Q_OBJECT - public: diff --git a/digikam/digikam/digikamfirstrun.h b/digikam/digikam/digikamfirstrun.h index 42688ca8..cabb0a54 100644 --- a/digikam/digikam/digikamfirstrun.h +++ b/digikam/digikam/digikamfirstrun.h @@ -44,7 +44,6 @@ class FirstRunWidget; class DIGIKAM_EXPORT DigikamFirstRun : public KDialogBase { Q_OBJECT - public: diff --git a/digikam/digikam/digikamview.h b/digikam/digikam/digikamview.h index 53c8bf44..f587602b 100644 --- a/digikam/digikam/digikamview.h +++ b/digikam/digikam/digikamview.h @@ -47,7 +47,6 @@ class DigikamViewPriv; class DigikamView : public TQHBox { Q_OBJECT - public: diff --git a/digikam/digikam/dio_p.h b/digikam/digikam/dio_p.h index 6646864c..61f881e5 100644 --- a/digikam/digikam/dio_p.h +++ b/digikam/digikam/dio_p.h @@ -39,7 +39,6 @@ namespace DIO class Watch : public TQObject { Q_OBJECT - public: diff --git a/digikam/digikam/firstrun.h b/digikam/digikam/firstrun.h index c97725b8..d9cd5133 100644 --- a/digikam/digikam/firstrun.h +++ b/digikam/digikam/firstrun.h @@ -42,7 +42,6 @@ namespace Digikam class DIGIKAM_EXPORT FirstRunWidget : public TQWidget { Q_OBJECT - public: diff --git a/digikam/digikam/folderview.cpp b/digikam/digikam/folderview.cpp index 4160dbf4..a4724e42 100644 --- a/digikam/digikam/folderview.cpp +++ b/digikam/digikam/folderview.cpp @@ -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())) diff --git a/digikam/digikam/folderview.h b/digikam/digikam/folderview.h index 9f9dcec9..bc3872a7 100644 --- a/digikam/digikam/folderview.h +++ b/digikam/digikam/folderview.h @@ -51,7 +51,6 @@ class FolderItem; class DIGIKAM_EXPORT FolderView : public TQListView { Q_OBJECT - public: diff --git a/digikam/digikam/iconview.cpp b/digikam/digikam/iconview.cpp index b9a5ac9c..40552ce5 100644 --- a/digikam/digikam/iconview.cpp +++ b/digikam/digikam/iconview.cpp @@ -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()); diff --git a/digikam/digikam/iconview.h b/digikam/digikam/iconview.h index 9865853a..0db4d360 100644 --- a/digikam/digikam/iconview.h +++ b/digikam/digikam/iconview.h @@ -49,7 +49,6 @@ class IconViewPriv; class DIGIKAM_EXPORT IconView : public TQScrollView { Q_OBJECT - public: diff --git a/digikam/digikam/imageattributeswatch.h b/digikam/digikam/imageattributeswatch.h index e5834bf1..eed5276a 100644 --- a/digikam/digikam/imageattributeswatch.h +++ b/digikam/digikam/imageattributeswatch.h @@ -38,7 +38,6 @@ namespace Digikam class ImageAttributesWatch : public TQObject { Q_OBJECT - public: diff --git a/digikam/digikam/imagepreviewview.cpp b/digikam/digikam/imagepreviewview.cpp index 2710771f..25afdc94 100644 --- a/digikam/digikam/imagepreviewview.cpp +++ b/digikam/digikam/imagepreviewview.cpp @@ -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) diff --git a/digikam/digikam/imagepreviewview.h b/digikam/digikam/imagepreviewview.h index 1952042e..89d9db4d 100644 --- a/digikam/digikam/imagepreviewview.h +++ b/digikam/digikam/imagepreviewview.h @@ -49,7 +49,6 @@ class DIGIKAM_EXPORT ImagePreviewView : public PreviewWidget { Q_OBJECT - public: diff --git a/digikam/digikam/kdateedit.h b/digikam/digikam/kdateedit.h index bc05e3f8..e283424a 100644 --- a/digikam/digikam/kdateedit.h +++ b/digikam/digikam/kdateedit.h @@ -56,7 +56,6 @@ namespace Digikam class KDateEdit : public TQComboBox { Q_OBJECT - public: diff --git a/digikam/digikam/kdatepickerpopup.h b/digikam/digikam/kdatepickerpopup.h index 2671df60..daa8b1b9 100644 --- a/digikam/digikam/kdatepickerpopup.h +++ b/digikam/digikam/kdatepickerpopup.h @@ -56,7 +56,6 @@ namespace Digikam class KDatePickerPopup: public TQPopupMenu { Q_OBJECT - public: diff --git a/digikam/digikam/kdatetimeedit.h b/digikam/digikam/kdatetimeedit.h index e9a5ae9b..090300f7 100644 --- a/digikam/digikam/kdatetimeedit.h +++ b/digikam/digikam/kdatetimeedit.h @@ -49,7 +49,6 @@ class KDateEdit; class KDateTimeEdit : public TQHBox { Q_OBJECT - public: diff --git a/digikam/digikam/kipiinterface.h b/digikam/digikam/kipiinterface.h index a83d4deb..3fe8a294 100644 --- a/digikam/digikam/kipiinterface.h +++ b/digikam/digikam/kipiinterface.h @@ -154,7 +154,6 @@ private: class DigikamKipiInterface : public KIPI::Interface { Q_OBJECT - public: diff --git a/digikam/digikam/mediaplayerview.h b/digikam/digikam/mediaplayerview.h index 9c78bb66..559e32f8 100644 --- a/digikam/digikam/mediaplayerview.h +++ b/digikam/digikam/mediaplayerview.h @@ -44,7 +44,6 @@ class MediaPlayerViewPriv; class DIGIKAM_EXPORT MediaPlayerView : public TQWidgetStack { Q_OBJECT - public: diff --git a/digikam/digikam/mimefilter.h b/digikam/digikam/mimefilter.h index f3f0bd68..4efe2254 100644 --- a/digikam/digikam/mimefilter.h +++ b/digikam/digikam/mimefilter.h @@ -36,7 +36,6 @@ class MimeFilterPriv; class MimeFilter : public TQComboBox { Q_OBJECT - public: diff --git a/digikam/digikam/monthwidget.h b/digikam/digikam/monthwidget.h index b0b16ecb..cf96e151 100644 --- a/digikam/digikam/monthwidget.h +++ b/digikam/digikam/monthwidget.h @@ -40,7 +40,6 @@ class MonthWidgetPriv; class MonthWidget : public TQFrame { Q_OBJECT - public: diff --git a/digikam/digikam/pixmapmanager.h b/digikam/digikam/pixmapmanager.h index 4b5db905..f3501d4a 100644 --- a/digikam/digikam/pixmapmanager.h +++ b/digikam/digikam/pixmapmanager.h @@ -50,7 +50,6 @@ class PixmapManagerPriv; class PixmapManager : public TQObject { Q_OBJECT - public: diff --git a/digikam/digikam/ratingfilter.h b/digikam/digikam/ratingfilter.h index 128920b3..404fee95 100644 --- a/digikam/digikam/ratingfilter.h +++ b/digikam/digikam/ratingfilter.h @@ -38,7 +38,6 @@ class RatingFilterPriv; class RatingFilter : public RatingWidget { Q_OBJECT - public: diff --git a/digikam/digikam/ratingpopupmenu.h b/digikam/digikam/ratingpopupmenu.h index 6a85b4a6..2be12575 100644 --- a/digikam/digikam/ratingpopupmenu.h +++ b/digikam/digikam/ratingpopupmenu.h @@ -36,7 +36,6 @@ class RatingPopupMenuPriv; class RatingPopupMenu : public TQPopupMenu { Q_OBJECT - public: diff --git a/digikam/digikam/ratingwidget.h b/digikam/digikam/ratingwidget.h index 8adc9170..573b5327 100644 --- a/digikam/digikam/ratingwidget.h +++ b/digikam/digikam/ratingwidget.h @@ -37,7 +37,6 @@ class RatingWidgetPriv; class RatingWidget : public TQWidget { Q_OBJECT - public: diff --git a/digikam/digikam/searchadvanceddialog.h b/digikam/digikam/searchadvanceddialog.h index 720cf2e3..d3080b81 100644 --- a/digikam/digikam/searchadvanceddialog.h +++ b/digikam/digikam/searchadvanceddialog.h @@ -51,7 +51,6 @@ class SearchAdvancedDialogPriv; class SearchAdvancedDialog : public KDialogBase { Q_OBJECT - public: diff --git a/digikam/digikam/searchfolderview.h b/digikam/digikam/searchfolderview.h index 1117a6c2..f100b8ba 100644 --- a/digikam/digikam/searchfolderview.h +++ b/digikam/digikam/searchfolderview.h @@ -38,7 +38,6 @@ class SearchFolderItem; class SearchFolderView : public FolderView { Q_OBJECT - public: diff --git a/digikam/digikam/searchquickdialog.h b/digikam/digikam/searchquickdialog.h index 084a0d90..64f3d907 100644 --- a/digikam/digikam/searchquickdialog.h +++ b/digikam/digikam/searchquickdialog.h @@ -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 */ diff --git a/digikam/digikam/searchresultsview.h b/digikam/digikam/searchresultsview.h index 56d3673b..1c5d8a78 100644 --- a/digikam/digikam/searchresultsview.h +++ b/digikam/digikam/searchresultsview.h @@ -52,7 +52,6 @@ class SearchResultsViewPriv; class SearchResultsView : public TQIconView { Q_OBJECT - public: diff --git a/digikam/digikam/searchwidgets.h b/digikam/digikam/searchwidgets.h index 8d773852..25c261d1 100644 --- a/digikam/digikam/searchwidgets.h +++ b/digikam/digikam/searchwidgets.h @@ -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: /** diff --git a/digikam/digikam/syncjob.h b/digikam/digikam/syncjob.h index bba5ddce..546a2d59 100644 --- a/digikam/digikam/syncjob.h +++ b/digikam/digikam/syncjob.h @@ -55,7 +55,6 @@ class TAlbum; class SyncJob : public TQObject { Q_OBJECT - public: diff --git a/digikam/digikam/tageditdlg.cpp b/digikam/digikam/tageditdlg.cpp index 3fdc7faf..3312bd74 100644 --- a/digikam/digikam/tageditdlg.cpp +++ b/digikam/digikam/tageditdlg.cpp @@ -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); // -------------------------------------------------------- diff --git a/digikam/digikam/tageditdlg.h b/digikam/digikam/tageditdlg.h index e499740d..d82f1c04 100644 --- a/digikam/digikam/tageditdlg.h +++ b/digikam/digikam/tageditdlg.h @@ -45,7 +45,6 @@ class TagEditDlgPriv; class TagEditDlg : public KDialogBase { Q_OBJECT - public: diff --git a/digikam/digikam/tagfilterview.h b/digikam/digikam/tagfilterview.h index 01a2f2cd..e5395d17 100644 --- a/digikam/digikam/tagfilterview.h +++ b/digikam/digikam/tagfilterview.h @@ -40,7 +40,6 @@ class TagFilterViewPrivate; class TagFilterView : public FolderView { Q_OBJECT - public: diff --git a/digikam/digikam/tagfolderview.h b/digikam/digikam/tagfolderview.h index af7463c0..483e1d9e 100644 --- a/digikam/digikam/tagfolderview.h +++ b/digikam/digikam/tagfolderview.h @@ -44,7 +44,6 @@ class TagFolderViewPriv; class TagFolderView : public FolderView { Q_OBJECT - public: diff --git a/digikam/digikam/tagspopupmenu.h b/digikam/digikam/tagspopupmenu.h index 3632ac38..942192bf 100644 --- a/digikam/digikam/tagspopupmenu.h +++ b/digikam/digikam/tagspopupmenu.h @@ -39,7 +39,6 @@ class TagsPopupMenuPriv; class TagsPopupMenu : public TQPopupMenu { Q_OBJECT - public: diff --git a/digikam/digikam/timelinefolderview.h b/digikam/digikam/timelinefolderview.h index 096bbaa3..e2e02c01 100644 --- a/digikam/digikam/timelinefolderview.h +++ b/digikam/digikam/timelinefolderview.h @@ -38,7 +38,6 @@ class TimeLineFolderItem; class TimeLineFolderView : public FolderView { Q_OBJECT - public: diff --git a/digikam/digikam/timelineview.h b/digikam/digikam/timelineview.h index cfc973a8..014bc2ac 100644 --- a/digikam/digikam/timelineview.h +++ b/digikam/digikam/timelineview.h @@ -41,7 +41,6 @@ class TimeLineViewPriv; class TimeLineView : public TQWidget { Q_OBJECT - public: diff --git a/digikam/digikam/timelinewidget.cpp b/digikam/digikam/timelinewidget.cpp index 2d175d6d..ffd5d9a7 100644 --- a/digikam/digikam/timelinewidget.cpp +++ b/digikam/digikam/timelinewidget.cpp @@ -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); diff --git a/digikam/digikam/timelinewidget.h b/digikam/digikam/timelinewidget.h index 2ceca1ca..bc865aea 100644 --- a/digikam/digikam/timelinewidget.h +++ b/digikam/digikam/timelinewidget.h @@ -45,7 +45,6 @@ class TimeLineWidgetPriv; class TimeLineWidget : public TQWidget { Q_OBJECT - public: diff --git a/digikam/digikam/welcomepageview.h b/digikam/digikam/welcomepageview.h index 43af116b..0355b570 100644 --- a/digikam/digikam/welcomepageview.h +++ b/digikam/digikam/welcomepageview.h @@ -43,7 +43,6 @@ namespace Digikam class DIGIKAM_EXPORT WelcomePageView : public KHTMLPart { Q_OBJECT - public: diff --git a/digikam/utilities/cameragui/mtqueue.h b/digikam/utilities/cameragui/mtqueue.h index 95b1931c..0fb80e5c 100644 --- a/digikam/utilities/cameragui/mtqueue.h +++ b/digikam/utilities/cameragui/mtqueue.h @@ -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 |