summaryrefslogtreecommitdiffstats
path: root/digikam/utilities/cameragui
diff options
context:
space:
mode:
Diffstat (limited to 'digikam/utilities/cameragui')
-rw-r--r--digikam/utilities/cameragui/albumselectdialog.cpp8
-rw-r--r--digikam/utilities/cameragui/animwidget.cpp12
-rw-r--r--digikam/utilities/cameragui/cameracontroller.cpp42
-rw-r--r--digikam/utilities/cameragui/camerafolderdialog.cpp4
-rw-r--r--digikam/utilities/cameragui/camerafolderitem.cpp4
-rw-r--r--digikam/utilities/cameragui/cameraiconitem.cpp22
-rw-r--r--digikam/utilities/cameragui/cameraiconview.cpp22
-rw-r--r--digikam/utilities/cameragui/cameraiconview.h2
-rw-r--r--digikam/utilities/cameragui/camerainfodialog.cpp16
-rw-r--r--digikam/utilities/cameragui/cameraui.cpp38
-rw-r--r--digikam/utilities/cameragui/freespacewidget.cpp14
-rw-r--r--digikam/utilities/cameragui/gpcamera.cpp60
-rw-r--r--digikam/utilities/cameragui/gpcamera.h4
-rw-r--r--digikam/utilities/cameragui/gpiteminfo.h4
-rw-r--r--digikam/utilities/cameragui/renamecustomizer.cpp20
-rw-r--r--digikam/utilities/cameragui/umscamera.cpp8
16 files changed, 140 insertions, 140 deletions
diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/digikam/utilities/cameragui/albumselectdialog.cpp
index 7fbf1ae..cbc23c8 100644
--- a/digikam/utilities/cameragui/albumselectdialog.cpp
+++ b/digikam/utilities/cameragui/albumselectdialog.cpp
@@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpopupmenu.h>
#include <tqcursor.h>
#include <tqdatetime.h>
@@ -300,14 +300,14 @@ void AlbumSelectDialog::slotUser1()
TQString newAlbumName = KInputDialog::getText(i18n("New Album Name"),
i18n("Creating new album in '%1'\n"
"Enter album name:")
- .tqarg(album->prettyURL()),
+ .arg(album->prettyURL()),
d->newAlbumString, &ok, this);
if (!ok)
return;
TQString errMsg;
PAlbum* newAlbum = AlbumManager::instance()->createPAlbum(album, newAlbumName,
- TQString(), TQDate::tqcurrentDate(),
+ TQString(), TQDate::currentDate(),
TQString(), errMsg);
if (!newAlbum)
{
@@ -380,7 +380,7 @@ void AlbumSelectDialog::slotSearchTextChanged(const TQString& filter)
if (!match)
{
- // check if any of the tqchildren match the search
+ // check if any of the children match the search
AlbumIterator it(palbum);
while (it.current())
{
diff --git a/digikam/utilities/cameragui/animwidget.cpp b/digikam/utilities/cameragui/animwidget.cpp
index 1b64f29..551c7a3 100644
--- a/digikam/utilities/cameragui/animwidget.cpp
+++ b/digikam/utilities/cameragui/animwidget.cpp
@@ -26,7 +26,7 @@
#include <tqpainter.h>
#include <tqpixmap.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqcolor.h>
#include <tqtimer.h>
@@ -87,24 +87,24 @@ void AnimWidget::stop()
{
d->pos = 0;
d->timer->stop();
- tqrepaint();
+ repaint();
}
void AnimWidget::paintEvent(TQPaintEvent*)
{
- d->pix.fill(tqcolorGroup().background());
+ d->pix.fill(colorGroup().background());
TQPainter p(&d->pix);
p.translate(d->size/2, d->size/2);
if (d->timer->isActive())
{
- p.setPen(TQPen(tqcolorGroup().text()));
+ p.setPen(TQPen(colorGroup().text()));
p.rotate( d->pos );
}
else
{
- p.setPen(TQPen(tqcolorGroup().dark()));
+ p.setPen(TQPen(colorGroup().dark()));
}
for ( int i=0 ; i<12 ; i++ )
@@ -120,7 +120,7 @@ void AnimWidget::paintEvent(TQPaintEvent*)
void AnimWidget::slotTimeout()
{
d->pos = (d->pos + 10) % 360;
- tqrepaint();
+ repaint();
}
bool AnimWidget::running() const
diff --git a/digikam/utilities/cameragui/cameracontroller.cpp b/digikam/utilities/cameragui/cameracontroller.cpp
index d8034a0..ebdd18c 100644
--- a/digikam/utilities/cameragui/cameracontroller.cpp
+++ b/digikam/utilities/cameragui/cameracontroller.cpp
@@ -270,13 +270,13 @@ void CameraThread::run()
{
TQString folder = cmd->map["folder"].asString();
- sendInfo(i18n("The files in %1 have been listed.").tqarg(folder));
+ sendInfo(i18n("The files in %1 have been listed.").arg(folder));
GPItemInfoList itemsList;
// setting getImageDimensions to false is a huge speedup for UMSCamera
if (!d->camera->getItemsInfoList(folder, itemsList, false))
{
- sendError(i18n("Failed to list files in %1").tqarg(folder));
+ sendError(i18n("Failed to list files in %1").arg(folder));
}
if (!itemsList.isEmpty())
@@ -292,7 +292,7 @@ void CameraThread::run()
TQApplication::postEvent(parent, event);
}
- sendInfo(i18n("Listing files in %1 is complete").tqarg(folder));
+ sendInfo(i18n("Listing files in %1 is complete").arg(folder));
break;
}
@@ -324,7 +324,7 @@ void CameraThread::run()
TQString folder = cmd->map["folder"].asString();
TQString file = cmd->map["file"].asString();
- sendInfo(i18n("Getting EXIF information for %1/%2...").tqarg(folder).tqarg(file));
+ sendInfo(i18n("Getting EXIF information for %1/%2...").arg(folder).arg(file));
char* edata = 0;
int esize = 0;
@@ -363,7 +363,7 @@ void CameraThread::run()
TQString copyright = cmd->map["copyright"].asString();
bool convertJpeg = cmd->map["convertJpeg"].asBool();
TQString losslessFormat = cmd->map["losslessFormat"].asString();
- sendInfo(i18n("Downloading file %1...").tqarg(file));
+ sendInfo(i18n("Downloading file %1...").arg(file));
// download to a temp file
@@ -375,7 +375,7 @@ void CameraThread::run()
KURL tempURL(dest);
tempURL = tempURL.upURL();
- tempURL.addPath( TQString(".digikam-camera-tmp1-%1").tqarg(getpid()).append(file));
+ tempURL.addPath( TQString(".digikam-camera-tmp1-%1").arg(getpid()).append(file));
DDebug() << "Downloading: " << file << " using (" << tempURL.path() << ")" << endl;
TQString temp = tempURL.path();
@@ -386,14 +386,14 @@ void CameraThread::run()
if (autoRotate)
{
DDebug() << "Exif autorotate: " << file << " using (" << tempURL.path() << ")" << endl;
- sendInfo(i18n("EXIF rotating file %1...").tqarg(file));
+ sendInfo(i18n("EXIF rotating file %1...").arg(file));
exifRotate(tempURL.path(), file);
}
if (fixDateTime || setPhotographerId || setCredits)
{
DDebug() << "Set Metadata from: " << file << " using (" << tempURL.path() << ")" << endl;
- sendInfo(i18n("Setting Metadata tags to file %1...").tqarg(file));
+ sendInfo(i18n("Setting Metadata tags to file %1...").arg(file));
DMetadata metadata(tempURL.path());
if (fixDateTime)
@@ -414,11 +414,11 @@ void CameraThread::run()
if (convertJpeg)
{
DDebug() << "Convert to LossLess: " << file << " using (" << tempURL.path() << ")" << endl;
- sendInfo(i18n("Converting %1 to lossless file format...").tqarg(file));
+ sendInfo(i18n("Converting %1 to lossless file format...").arg(file));
KURL tempURL2(dest);
tempURL2 = tempURL2.upURL();
- tempURL2.addPath( TQString(".digikam-camera-tmp2-%1").tqarg(getpid()).append(file));
+ tempURL2.addPath( TQString(".digikam-camera-tmp2-%1").arg(getpid()).append(file));
temp = tempURL2.path();
if (!jpegConvert(tempURL.path(), tempURL2.path(), file, losslessFormat))
@@ -461,7 +461,7 @@ void CameraThread::run()
TQString file = cmd->map["file"].asString();
TQString dest = cmd->map["dest"].asString();
- sendInfo(i18n("Retrieving file %1 from camera...").tqarg(file));
+ sendInfo(i18n("Retrieving file %1 from camera...").arg(file));
bool result = d->camera->downloadItem(folder, file, dest);
@@ -475,7 +475,7 @@ void CameraThread::run()
}
else
{
- sendError(i18n("Failed to retrieve file %1 from camera").tqarg(file));
+ sendError(i18n("Failed to retrieve file %1 from camera").arg(file));
}
break;
}
@@ -490,7 +490,7 @@ void CameraThread::run()
// The source file path to download in camera.
TQString src = cmd->map["srcFilePath"].asString();
- sendInfo(i18n("Uploading file %1 to camera...").tqarg(file));
+ sendInfo(i18n("Uploading file %1 to camera...").arg(file));
GPItemInfo itemsInfo;
@@ -521,7 +521,7 @@ void CameraThread::run()
TQString folder = cmd->map["folder"].asString();
TQString file = cmd->map["file"].asString();
- sendInfo(i18n("Deleting file %1...").tqarg(file));
+ sendInfo(i18n("Deleting file %1...").arg(file));
bool result = d->camera->deleteItem(folder, file);
@@ -547,7 +547,7 @@ void CameraThread::run()
TQString file = cmd->map["file"].asString();
bool lock = cmd->map["lock"].asBool();
- sendInfo(i18n("Toggle lock file %1...").tqarg(file));
+ sendInfo(i18n("Toggle lock file %1...").arg(file));
bool result = d->camera->setLockItem(folder, file, lock);
@@ -996,7 +996,7 @@ void CameraController::customEvent(TQCustomEvent* e)
{
unlink(TQFile::encodeName(temp));
d->timer->start(50);
- emit signalInfoMsg(i18n("Skipped file %1").tqarg(file));
+ emit signalInfoMsg(i18n("Skipped file %1").arg(file));
emit signalSkipped(folder, file);
return;
}
@@ -1023,7 +1023,7 @@ void CameraController::customEvent(TQCustomEvent* e)
d->timer->stop();
- TQString msg = i18n("Failed to download file \"%1\".").tqarg(file);
+ TQString msg = i18n("Failed to download file \"%1\".").arg(file);
if (!d->canceled)
{
@@ -1062,7 +1062,7 @@ void CameraController::customEvent(TQCustomEvent* e)
d->timer->stop();
- TQString msg = i18n("Failed to upload file \"%1\".").tqarg(file);
+ TQString msg = i18n("Failed to upload file \"%1\".").arg(file);
if (!d->canceled)
{
@@ -1097,7 +1097,7 @@ void CameraController::customEvent(TQCustomEvent* e)
d->timer->stop();
emit signalDeleted(folder, file, false);
- TQString msg = i18n("Failed to delete file \"%1\".").tqarg(file);
+ TQString msg = i18n("Failed to delete file \"%1\".").arg(file);
if (!d->canceled)
{
@@ -1132,7 +1132,7 @@ void CameraController::customEvent(TQCustomEvent* e)
d->timer->stop();
emit signalLocked(folder, file, false);
- TQString msg = i18n("Failed to toggle lock file \"%1\".").tqarg(file);
+ TQString msg = i18n("Failed to toggle lock file \"%1\".").arg(file);
if (!d->canceled)
{
@@ -1162,7 +1162,7 @@ void CameraController::customEvent(TQCustomEvent* e)
urlList << url;
ImageWindow *im = ImageWindow::imagewindow();
- im->loadURL(urlList, url, i18n("Camera \"%1\"").tqarg(d->camera->model()), false);
+ im->loadURL(urlList, url, i18n("Camera \"%1\"").arg(d->camera->model()), false);
if (im->isHidden())
im->show();
diff --git a/digikam/utilities/cameragui/camerafolderdialog.cpp b/digikam/utilities/cameragui/camerafolderdialog.cpp
index ba3b99d..1d16952 100644
--- a/digikam/utilities/cameragui/camerafolderdialog.cpp
+++ b/digikam/utilities/cameragui/camerafolderdialog.cpp
@@ -24,7 +24,7 @@
// TQt includes.
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqframe.h>
// KDE includes.
@@ -49,7 +49,7 @@ CameraFolderDialog::CameraFolderDialog(TQWidget *parent, CameraIconView *cameraV
const TQStringList& cameraFolderList,
const TQString& cameraName, const TQString& rootPath)
: KDialogBase(parent, 0, true,
- i18n("%1 - Select Camera Folder").tqarg(cameraName),
+ i18n("%1 - Select Camera Folder").arg(cameraName),
Help|Ok|Cancel, Ok, true)
{
setHelp("camerainterface.anchor", "digikam");
diff --git a/digikam/utilities/cameragui/camerafolderitem.cpp b/digikam/utilities/cameragui/camerafolderitem.cpp
index 6adc480..f53508a 100644
--- a/digikam/utilities/cameragui/camerafolderitem.cpp
+++ b/digikam/utilities/cameragui/camerafolderitem.cpp
@@ -91,13 +91,13 @@ TQString CameraFolderItem::folderPath()
void CameraFolderItem::changeCount(int val)
{
d->count += val;
- setText(0, TQString("%1 (%2)").tqarg(d->name).tqarg(TQString::number(d->count)));
+ setText(0, TQString("%1 (%2)").arg(d->name).arg(TQString::number(d->count)));
}
void CameraFolderItem::setCount(int val)
{
d->count = val;
- setText(0, TQString("%1 (%2)").tqarg(d->name).tqarg(TQString::number(d->count)));
+ setText(0, TQString("%1 (%2)").arg(d->name).arg(TQString::number(d->count)));
}
int CameraFolderItem::count()
diff --git a/digikam/utilities/cameragui/cameraiconitem.cpp b/digikam/utilities/cameragui/cameraiconitem.cpp
index b0a7da2..fade861 100644
--- a/digikam/utilities/cameragui/cameraiconitem.cpp
+++ b/digikam/utilities/cameragui/cameraiconitem.cpp
@@ -192,7 +192,7 @@ void CameraIconViewItem::paintItem()
void CameraIconViewItem::setDownloadName(const TQString& downloadName)
{
d->downloadName = downloadName;
- tqrepaint();
+ repaint();
}
TQString CameraIconViewItem::getDownloadName() const
@@ -203,7 +203,7 @@ TQString CameraIconViewItem::getDownloadName() const
void CameraIconViewItem::setDownloaded(int status)
{
d->itemInfo->downloaded = status;
- tqrepaint();
+ repaint();
}
bool CameraIconViewItem::isDownloaded() const
@@ -218,7 +218,7 @@ void CameraIconViewItem::toggleLock()
else
d->itemInfo->writePermissions = 0;
- tqrepaint();
+ repaint();
}
void CameraIconViewItem::calcRect(const TQString& itemName, const TQString& downloadName)
@@ -229,8 +229,8 @@ void CameraIconViewItem::calcRect(const TQString& itemName, const TQString& down
d->pixRect = TQRect(0,0,0,0);
d->textRect = TQRect(0,0,0,0);
d->extraRect = TQRect(0,0,0,0);
- TQRect tqitemRect = rect();
- tqitemRect.moveTopLeft(TQPoint(0, 0));
+ TQRect itemRect = rect();
+ itemRect.moveTopLeft(TQPoint(0, 0));
d->pixRect.setWidth(thumbSize);
d->pixRect.setHeight(thumbSize);
@@ -264,19 +264,19 @@ void CameraIconViewItem::calcRect(const TQString& itemName, const TQString& down
int w = TQMAX(d->textRect.width(), d->pixRect.width() );
int h = d->textRect.height() + d->pixRect.height() ;
- tqitemRect.setWidth(w+4);
- tqitemRect.setHeight(h+4);
+ itemRect.setWidth(w+4);
+ itemRect.setHeight(h+4);
// Center the pix and text rect
d->pixRect = TQRect(2, 2, d->pixRect.width(), d->pixRect.height());
- d->textRect = TQRect((tqitemRect.width() - d->textRect.width())/2,
- tqitemRect.height() - d->textRect.height(),
+ d->textRect = TQRect((itemRect.width() - d->textRect.width())/2,
+ itemRect.height() - d->textRect.height(),
d->textRect.width(), d->textRect.height());
if (!d->extraRect.isEmpty())
{
- d->extraRect = TQRect((tqitemRect.width() - d->extraRect.width())/2,
- tqitemRect.height() - d->extraRect.height(),
+ d->extraRect = TQRect((itemRect.width() - d->extraRect.width())/2,
+ itemRect.height() - d->extraRect.height(),
d->extraRect.width(), d->extraRect.height());
}
}
diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp
index 927efd4..b33a055 100644
--- a/digikam/utilities/cameragui/cameraiconview.cpp
+++ b/digikam/utilities/cameragui/cameraiconview.cpp
@@ -33,7 +33,7 @@
#include <tqfontmetrics.h>
#include <tqfont.h>
#include <tqdragobject.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
// KDE includes.
@@ -81,7 +81,7 @@ public:
TQDict<CameraIconViewItem> itemDict;
- TQRect tqitemRect;
+ TQRect itemRect;
TQPixmap itemRegPixmap;
TQPixmap itemSelPixmap;
@@ -375,7 +375,7 @@ void CameraIconView::setThumbnail(const TQString& folder, const TQString& filena
return;
item->setThumbnail(image);
- item->tqrepaint();
+ item->repaint();
}
void CameraIconView::ensureItemVisible(CameraIconViewItem *item)
@@ -739,7 +739,7 @@ void CameraIconView::slotRightButtonClicked(const TQPoint&)
if (d->cameraUI->isBusy())
return;
- TQMimeSource *data = kapp->tqclipboard()->data(TQClipboard::Clipboard);
+ TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
if(!data || !TQUriDrag::canDecode(data))
return;
@@ -770,9 +770,9 @@ void CameraIconView::uploadItemPopupMenu(const KURL::List& srcURLs)
}
}
-TQRect CameraIconView::tqitemRect() const
+TQRect CameraIconView::itemRect() const
{
- return d->tqitemRect;
+ return d->itemRect;
}
void CameraIconView::setThumbnailSize(const ThumbnailSize& thumbSize)
@@ -825,13 +825,13 @@ void CameraIconView::updateItemRectsPixmap()
r.setWidth(TQMAX(TQMAX(pixRect.width(), textRect.width()), extraRect.width()) + 4);
r.setHeight(pixRect.height() + textRect.height() + extraRect.height() + 4);
- d->tqitemRect = r;
+ d->itemRect = r;
- d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->tqitemRect.width(),
- d->tqitemRect.height());
+ d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->itemRect.width(),
+ d->itemRect.height());
- d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->tqitemRect.width(),
- d->tqitemRect.height());
+ d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->itemRect.width(),
+ d->itemRect.height());
}
void CameraIconView::slotThemeChanged()
diff --git a/digikam/utilities/cameragui/cameraiconview.h b/digikam/utilities/cameragui/cameraiconview.h
index 65dee0f..7b67a3b 100644
--- a/digikam/utilities/cameragui/cameraiconview.h
+++ b/digikam/utilities/cameragui/cameraiconview.h
@@ -84,7 +84,7 @@ public:
TQPixmap newPicturePixmap() const;
TQPixmap unknowPicturePixmap() const;
- virtual TQRect tqitemRect() const;
+ virtual TQRect itemRect() const;
TQString defaultDownloadName(CameraIconViewItem *item);
diff --git a/digikam/utilities/cameragui/camerainfodialog.cpp b/digikam/utilities/cameragui/camerainfodialog.cpp
index 6221bd9..0bd5c13 100644
--- a/digikam/utilities/cameragui/camerainfodialog.cpp
+++ b/digikam/utilities/cameragui/camerainfodialog.cpp
@@ -24,9 +24,9 @@
// TQt includes.
-#include <tqlayout.h>
+#include <layout.h>
#include <tqframe.h>
-#include <tqtextedit.h>
+#include <textedit.h>
// KDE includes.
@@ -50,32 +50,32 @@ CameraInfoDialog::CameraInfoDialog(TQWidget *parent, const TQString& summary, co
// ----------------------------------------------------------
TQFrame *p1 = addPage( i18n("Summary"), i18n("Camera Summary"), BarIcon("contents2", KIcon::SizeMedium) );
- TQVBoxLayout *p1tqlayout = new TQVBoxLayout( p1, 0, 6 );
+ TQVBoxLayout *p1layout = new TQVBoxLayout( p1, 0, 6 );
TQTextEdit *summaryView = new TQTextEdit(summary, TQString(), p1);
summaryView->setWordWrap(TQTextEdit::WidgetWidth);
summaryView->setReadOnly(true);
- p1tqlayout->addWidget(summaryView);
+ p1layout->addWidget(summaryView);
// ----------------------------------------------------------
TQFrame *p2 = addPage( i18n("Manual"), i18n("Camera Manual"), BarIcon("contents", KIcon::SizeMedium) );
- TQVBoxLayout *p2tqlayout = new TQVBoxLayout( p2, 0, 6 );
+ TQVBoxLayout *p2layout = new TQVBoxLayout( p2, 0, 6 );
TQTextEdit *manualView = new TQTextEdit(manual, TQString(), p2);
manualView->setWordWrap(TQTextEdit::WidgetWidth);
manualView->setReadOnly(true);
- p2tqlayout->addWidget(manualView);
+ p2layout->addWidget(manualView);
// ----------------------------------------------------------
TQFrame *p3 = addPage( i18n("About"), i18n("About Driver"), BarIcon("camera", KIcon::SizeMedium) );
- TQVBoxLayout *p3tqlayout = new TQVBoxLayout( p3, 0, 6 );
+ TQVBoxLayout *p3layout = new TQVBoxLayout( p3, 0, 6 );
TQTextEdit *aboutView = new TQTextEdit(about, TQString(), p3);
aboutView->setWordWrap(TQTextEdit::WidgetWidth);
aboutView->setReadOnly(true);
- p3tqlayout->addWidget(aboutView);
+ p3layout->addWidget(aboutView);
}
CameraInfoDialog::~CameraInfoDialog()
diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp
index ce8212e..4bdd127 100644
--- a/digikam/utilities/cameragui/cameraui.cpp
+++ b/digikam/utilities/cameragui/cameraui.cpp
@@ -27,7 +27,7 @@
// TQt includes.
#include <tqvgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqtoolbutton.h>
#include <tqiconview.h>
@@ -249,7 +249,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
d->view = new CameraIconView(this, d->splitter);
TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1);
- d->view->tqsetSizePolicy(rightSzPolicy);
+ d->view->setSizePolicy(rightSzPolicy);
d->rightSidebar = new ImagePropertiesSideBarCamGui(widget, "CameraGui Sidebar Right", d->splitter,
Sidebar::Right, true);
@@ -354,7 +354,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
// -------------------------------------------------------------------------
d->cancelBtn = new TQToolButton(plainPage());
- d->cancelBtn->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+ d->cancelBtn->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
d->cancelBtn->setPixmap( SmallIcon( "cancel" ) );
d->cancelBtn->setEnabled(false);
@@ -364,13 +364,13 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
d->progress->hide();
TQWidget *frame = new TQWidget(plainPage());
- TQHBoxLayout* tqlayout = new TQHBoxLayout(frame);
- frame->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+ TQHBoxLayout* layout = new TQHBoxLayout(frame);
+ frame->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
KURLLabel *pixmapLogo = new KURLLabel( Digikam::webProjectUrl(), TQString(), frame );
pixmapLogo->setMargin(0);
pixmapLogo->setScaledContents( false );
- pixmapLogo->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+ pixmapLogo->setSizePolicy(TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum));
TQToolTip::add(pixmapLogo, i18n("Visit digiKam project website"));
KGlobal::dirs()->addResourceType("logo-digikam", KGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("logo-digikam", "logo-digikam.png");
@@ -379,10 +379,10 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
d->anim = new AnimWidget(frame, pixmapLogo->height()-2);
- tqlayout->setMargin(0);
- tqlayout->setSpacing(0);
- tqlayout->addWidget( pixmapLogo );
- tqlayout->addWidget( d->anim );
+ layout->setMargin(0);
+ layout->setSpacing(0);
+ layout->addWidget( pixmapLogo );
+ layout->addWidget( d->anim );
d->freeSpaceWidget = new FreeSpaceWidget(plainPage(), 100);
@@ -739,7 +739,7 @@ void CameraUI::finishDialog()
{
CameraList* clist = CameraList::instance();
if (clist)
- clist->changeCameraAccessTime(d->cameraTitle, TQDateTime::TQDateTime::tqcurrentDateTime());
+ clist->changeCameraAccessTime(d->cameraTitle, TQDateTime::TQDateTime::currentDateTime());
}
// When a directory is created, a watch is put on it to spot new files
@@ -1015,9 +1015,9 @@ void CameraUI::slotUpload()
// Nota: we cannot use here "image/x-raw" type mime from KDE because it uncomplete
// or unavailable(dcraw_0)(see file #121242 in B.K.O).
#if KDCRAW_VERSION < 0x000106
- patternList.append(TQString("\n%1|Camera RAW files").tqarg(TQString(KDcrawIface::DcrawBinary::instance()->rawFiles())));
+ patternList.append(TQString("\n%1|Camera RAW files").arg(TQString(KDcrawIface::DcrawBinary::instance()->rawFiles())));
#else
- patternList.append(TQString("\n%1|Camera RAW files").tqarg(TQString(KDcrawIface::KDcraw::rawFiles())));
+ patternList.append(TQString("\n%1|Camera RAW files").arg(TQString(KDcrawIface::KDcraw::rawFiles())));
#endif
fileformats = patternList.join("\n");
@@ -1062,7 +1062,7 @@ void CameraUI::slotUploadItems(const KURL::List& urls)
{
TQString msg(i18n("Camera Folder <b>%1</b> already contains item <b>%2</b><br>"
"Please enter a new file name (without extension):")
- .tqarg(cameraFolder).tqarg(fi.fileName()));
+ .arg(cameraFolder).arg(fi.fileName()));
#if KDE_IS_VERSION(3,2,0)
name = KInputDialog::getText(i18n("File already exists"), msg, name, &ok, this);
@@ -1125,8 +1125,8 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album)
"to download and process selected pictures from camera.\n\n"
"Estimated space require: %1\n"
"Available free space: %2")
- .tqarg(KIO::convertSizeFromKB(dSize))
- .tqarg(KIO::convertSizeFromKB(d->freeSpaceWidget->kBAvail())));
+ .arg(KIO::convertSizeFromKB(dSize))
+ .arg(KIO::convertSizeFromKB(d->freeSpaceWidget->kBAvail())));
return;
}
@@ -1621,8 +1621,8 @@ bool CameraUI::createAutoAlbum(const KURL& parentURL, const TQString& sub,
else
{
errMsg = i18n("A file with same name (%1) exists in folder %2")
- .tqarg(sub)
- .tqarg(parentURL.path());
+ .arg(sub)
+ .arg(parentURL.path());
return false;
}
}
@@ -1634,7 +1634,7 @@ bool CameraUI::createAutoAlbum(const KURL& parentURL, const TQString& sub,
if (!parent)
{
errMsg = i18n("Failed to find Album for path '%1'")
- .tqarg(parentURL.path());
+ .arg(parentURL.path());
return false;
}
diff --git a/digikam/utilities/cameragui/freespacewidget.cpp b/digikam/utilities/cameragui/freespacewidget.cpp
index 0a32eb2..1f103eb 100644
--- a/digikam/utilities/cameragui/freespacewidget.cpp
+++ b/digikam/utilities/cameragui/freespacewidget.cpp
@@ -27,7 +27,7 @@
#include <tqtooltip.h>
#include <tqpainter.h>
#include <tqpixmap.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqcolor.h>
#include <tqtimer.h>
#include <tqfont.h>
@@ -109,7 +109,7 @@ void FreeSpaceWidget::setEstimatedDSizeKb(unsigned long dSize)
{
d->dSizeKb = dSize;
updatePixmap();
- tqrepaint();
+ repaint();
}
unsigned long FreeSpaceWidget::estimatedDSizeKb()
@@ -151,10 +151,10 @@ void FreeSpaceWidget::updatePixmap()
{
TQPixmap fimgPix = SmallIcon("folder_image");
d->pix = TQPixmap(size());
- d->pix.fill(tqcolorGroup().background());
+ d->pix.fill(colorGroup().background());
TQPainter p(&d->pix);
- p.setPen(tqcolorGroup().mid());
+ p.setPen(colorGroup().mid());
p.drawRect(0, 0, d->pix.width(), d->pix.height());
p.drawPixmap(2, d->pix.height()/2-fimgPix.height()/2,
fimgPix, 0, 0, fimgPix.width(), fimgPix.height());
@@ -173,8 +173,8 @@ void FreeSpaceWidget::updatePixmap()
p.drawRect(gRect);
TQRect tRect(fimgPix.height()+2, 1, d->pix.width()-2-fimgPix.width()-2, d->pix.height()-2);
- TQString text = TQString("%1%").tqarg(peUsed);
- p.setPen(tqcolorGroup().text());
+ TQString text = TQString("%1%").arg(peUsed);
+ p.setPen(colorGroup().text());
TQFontMetrics fontMt = p.fontMetrics();
TQRect fontRect = fontMt.boundingRect(tRect.x(), tRect.y(),
tRect.width(), tRect.height(), 0, text);
@@ -246,7 +246,7 @@ void FreeSpaceWidget::slotAvailableFreeSpace(const unsigned long& kBSize, const
d->percentUsed = 100 - (int)(100.0*kBAvail/kBSize);
d->isValid = true;
updatePixmap();
- tqrepaint();
+ repaint();
}
} // namespace Digikam
diff --git a/digikam/utilities/cameragui/gpcamera.cpp b/digikam/utilities/cameragui/gpcamera.cpp
index 9c6be9b..28b7f3e 100644
--- a/digikam/utilities/cameragui/gpcamera.cpp
+++ b/digikam/utilities/cameragui/gpcamera.cpp
@@ -80,19 +80,19 @@ public:
CameraAbilities cameraAbilities;
};
-class GPtqStatus
+class GPStatus
{
public:
- GPtqStatus()
+ GPStatus()
{
context = gp_context_new();
cancel = false;
gp_context_set_cancel_func(context, cancel_func, 0);
}
- ~GPtqStatus()
+ ~GPStatus()
{
gp_context_unref(context);
cancel = false;
@@ -108,7 +108,7 @@ public:
}
};
-bool GPtqStatus::cancel = false;
+bool GPStatus::cancel = false;
GPCamera::GPCamera(const TQString& title, const TQString& model, const TQString& port, const TQString& path)
: DKCamera(title, model, port, path)
@@ -202,7 +202,7 @@ bool GPCamera::doConnect()
m_status = 0;
}
- m_status = new GPtqStatus();
+ m_status = new GPStatus();
gp_abilities_list_new(&abilList);
gp_abilities_list_load(abilList, m_status->context);
@@ -271,7 +271,7 @@ bool GPCamera::doConnect()
// -- Now try to initialize the camera -----------------
- m_status = new GPtqStatus();
+ m_status = new GPStatus();
// Try and initialize the camera to see if its connected
errorCode = gp_camera_init(d->camera, m_status->context);
@@ -331,7 +331,7 @@ bool GPCamera::getSubFolders(const TQString& folder, TQStringList& subFolderList
delete m_status;
m_status = 0;
}
- m_status = new GPtqStatus();
+ m_status = new GPStatus();
errorCode = gp_camera_folder_list_folders(d->camera, TQFile::encodeName(folder), clist, m_status->context);
if (errorCode != GP_OK)
@@ -378,7 +378,7 @@ bool GPCamera::getItemsList(const TQString& folder, TQStringList& itemsList)
delete m_status;
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
gp_list_new(&clist);
@@ -429,7 +429,7 @@ bool GPCamera::getItemsInfoList(const TQString& folder, GPItemInfoList& items, b
delete m_status;
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
gp_list_new(&clist);
@@ -538,7 +538,7 @@ bool GPCamera::getThumbnail(const TQString& folder, const TQString& itemName, TQ
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_file_get(d->camera, TQFile::encodeName(folder),
TQFile::encodeName(itemName),
@@ -588,7 +588,7 @@ bool GPCamera::getExif(const TQString& folder, const TQString& itemName,
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_file_get(d->camera, TQFile::encodeName(folder),
TQFile::encodeName(itemName),
@@ -638,7 +638,7 @@ bool GPCamera::downloadItem(const TQString& folder, const TQString& itemName,
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_file_get(d->camera, TQFile::encodeName(folder),
TQFile::encodeName(itemName),
@@ -679,7 +679,7 @@ bool GPCamera::setLockItem(const TQString& folder, const TQString& itemName, boo
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
CameraFileInfo info;
errorCode = gp_camera_file_get_info(d->camera, TQFile::encodeName(folder),
@@ -737,7 +737,7 @@ bool GPCamera::deleteItem(const TQString& folder, const TQString& itemName)
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_file_delete(d->camera, TQFile::encodeName(folder),
TQFile::encodeName(itemName),
@@ -786,7 +786,7 @@ bool GPCamera::deleteAllItems(const TQString& folder)
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_folder_delete_all(d->camera, TQFile::encodeName(folder),
m_status->context);
@@ -843,7 +843,7 @@ bool GPCamera::uploadItem(const TQString& folder, const TQString& itemName, cons
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_folder_put_file(d->camera,
TQFile::encodeName(folder),
@@ -941,7 +941,7 @@ bool GPCamera::cameraSummary(TQString& summary)
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_get_summary(d->camera, &sum, m_status->context);
if (errorCode != GP_OK)
@@ -962,15 +962,15 @@ bool GPCamera::cameraSummary(TQString& summary)
"Upload items: %7\n"
"Create directories: %8\n"
"Delete directories: %9\n\n")
- .tqarg(title())
- .tqarg(model())
- .tqarg(port())
- .tqarg(path())
- .tqarg(thumbnailSupport() ? i18n("yes") : i18n("no"))
- .tqarg(deleteSupport() ? i18n("yes") : i18n("no"))
- .tqarg(uploadSupport() ? i18n("yes") : i18n("no"))
- .tqarg(mkDirSupport() ? i18n("yes") : i18n("no"))
- .tqarg(delDirSupport() ? i18n("yes") : i18n("no"));
+ .arg(title())
+ .arg(model())
+ .arg(port())
+ .arg(path())
+ .arg(thumbnailSupport() ? i18n("yes") : i18n("no"))
+ .arg(deleteSupport() ? i18n("yes") : i18n("no"))
+ .arg(uploadSupport() ? i18n("yes") : i18n("no"))
+ .arg(mkDirSupport() ? i18n("yes") : i18n("no"))
+ .arg(delDirSupport() ? i18n("yes") : i18n("no"));
summary.append(TQString(sum.text));
@@ -990,7 +990,7 @@ bool GPCamera::cameraManual(TQString& manual)
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_get_manual(d->camera, &man, m_status->context);
if (errorCode != GP_OK)
@@ -1020,7 +1020,7 @@ bool GPCamera::cameraAbout(TQString& about)
m_status = 0;
}
- m_status = new GPtqStatus;
+ m_status = new GPStatus;
errorCode = gp_camera_get_about(d->camera, &abt, m_status->context);
if (errorCode != GP_OK)
@@ -1193,8 +1193,8 @@ int GPCamera::autoDetect(TQString& model, TQString& port)
if (camModel_ && camPort_)
{
- model = TQString::tqfromLatin1(camModel_);
- port = TQString::tqfromLatin1(camPort_);
+ model = TQString::fromLatin1(camModel_);
+ port = TQString::fromLatin1(camPort_);
gp_list_free(camList);
return 0;
}
diff --git a/digikam/utilities/cameragui/gpcamera.h b/digikam/utilities/cameragui/gpcamera.h
index 50752d6..7071e97 100644
--- a/digikam/utilities/cameragui/gpcamera.h
+++ b/digikam/utilities/cameragui/gpcamera.h
@@ -35,7 +35,7 @@ namespace Digikam
{
class GPCameraPrivate;
-class GPtqStatus;
+class GPStatus;
// Gphoto2 camera Implementation of abstract type DKCamera
@@ -99,7 +99,7 @@ private:
private:
GPCameraPrivate *d;
- GPtqStatus *m_status;
+ GPStatus *m_status;
};
} // namespace Digikam
diff --git a/digikam/utilities/cameragui/gpiteminfo.h b/digikam/utilities/cameragui/gpiteminfo.h
index 8143c5f..02b2869 100644
--- a/digikam/utilities/cameragui/gpiteminfo.h
+++ b/digikam/utilities/cameragui/gpiteminfo.h
@@ -44,7 +44,7 @@ class GPItemInfo
public:
- enum DownloadtqStatus
+ enum DownloadStatus
{
DownloadUnknow = -1,
DownloadedNo = 0,
@@ -59,7 +59,7 @@ public:
long size;
int width;
int height;
- int downloaded; // See DownloadtqStatus enum.
+ int downloaded; // See DownloadStatus enum.
int readPermissions;
int writePermissions;
diff --git a/digikam/utilities/cameragui/renamecustomizer.cpp b/digikam/utilities/cameragui/renamecustomizer.cpp
index 544ec8e..87b441e 100644
--- a/digikam/utilities/cameragui/renamecustomizer.cpp
+++ b/digikam/utilities/cameragui/renamecustomizer.cpp
@@ -26,7 +26,7 @@
// TQt includes.
#include <tqdatetime.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqradiobutton.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
@@ -136,7 +136,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle
setFrameStyle( TQFrame::NoFrame );
setRadioButtonExclusive(true);
setColumnLayout(0, Qt::Vertical);
- TQGridLayout* mainLayout = new TQGridLayout(tqlayout(), 4, 1);
+ TQGridLayout* mainLayout = new TQGridLayout(layout(), 4, 1);
// ----------------------------------------------------------------
@@ -151,17 +151,17 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle
d->renameDefaultBox->setColumnLayout(0, Qt::Vertical);
d->renameDefaultCase = new TQLabel( i18n("Change case to:"), d->renameDefaultBox );
- d->renameDefaultCase->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
+ d->renameDefaultCase->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
d->renameDefaultCaseType = new TQComboBox( d->renameDefaultBox );
d->renameDefaultCaseType->insertItem(i18n("Leave as Is"), 0);
d->renameDefaultCaseType->insertItem(i18n("Upper"), 1);
d->renameDefaultCaseType->insertItem(i18n("Lower"), 2);
- d->renameDefaultCaseType->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
+ d->renameDefaultCaseType->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
TQWhatsThis::add( d->renameDefaultCaseType, i18n("<p>Set the method to use to change the case "
"of image filenames."));
- TQHBoxLayout* boxLayout1 = new TQHBoxLayout( d->renameDefaultBox->tqlayout() );
+ TQHBoxLayout* boxLayout1 = new TQHBoxLayout( d->renameDefaultBox->layout() );
boxLayout1->addSpacing( 10 );
boxLayout1->addWidget( d->renameDefaultCase );
boxLayout1->addWidget( d->renameDefaultCaseType );
@@ -180,7 +180,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle
d->renameCustomBox->setInsideMargin(0);
d->renameCustomBox->setColumnLayout(0, Qt::Vertical);
- TQGridLayout* renameCustomBoxLayout = new TQGridLayout(d->renameCustomBox->tqlayout(),
+ TQGridLayout* renameCustomBoxLayout = new TQGridLayout(d->renameCustomBox->layout(),
6, 2, KDialogBase::spacingHint());
renameCustomBoxLayout->setColSpacing( 0, 10 );
@@ -222,9 +222,9 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle
"<p><b>Local Settings</b>: the date format depending on KDE control panel settings.</p>"
"<p><b>Advanced:</b> allows the user to specify a custom date format.</p>"));
d->dateTimeButton = new TQPushButton(SmallIcon("configure"), TQString(), dateTimeWidget);
- TQSizePolicy policy = d->dateTimeButton->tqsizePolicy();
+ TQSizePolicy policy = d->dateTimeButton->sizePolicy();
policy.setHorData(TQSizePolicy::Maximum);
- d->dateTimeButton->tqsetSizePolicy(policy);
+ d->dateTimeButton->setSizePolicy(policy);
TQHBoxLayout *boxLayout2 = new TQHBoxLayout(dateTimeWidget);
boxLayout2->addWidget(d->dateTimeLabel);
boxLayout2->addWidget(d->dateTimeFormat);
@@ -355,7 +355,7 @@ TQString RenameCustomizer::newName(const TQDateTime &dateTime, int index, const
name += seq;
if (d->addCameraNameBox->isChecked())
- name += TQString("-%1").tqarg(d->cameraTitle.simplifyWhiteSpace().replace(" ", ""));
+ name += TQString("-%1").arg(d->cameraTitle.simplifyWhiteSpace().replace(" ", ""));
name += d->renameCustomSuffix->text();
name += extension;
@@ -389,7 +389,7 @@ void RenameCustomizer::slotRadioButtonClicked(int)
void RenameCustomizer::slotRenameOptionsChanged()
{
- d->focusedWidget = tqfocusWidget();
+ d->focusedWidget = focusWidget();
if (d->addSeqNumberBox->isChecked())
{
diff --git a/digikam/utilities/cameragui/umscamera.cpp b/digikam/utilities/cameragui/umscamera.cpp
index ed5e416..01e6d98 100644
--- a/digikam/utilities/cameragui/umscamera.cpp
+++ b/digikam/utilities/cameragui/umscamera.cpp
@@ -491,10 +491,10 @@ bool UMSCamera::cameraSummary(TQString& summary)
"Model: %2<br>"
"Port: %3<br>"
"Path: %4<br>")
- .tqarg(title())
- .tqarg(model())
- .tqarg(port())
- .tqarg(path()));
+ .arg(title())
+ .arg(model())
+ .arg(port())
+ .arg(path()));
return true;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-27 04:55:42 +0000