← Back to branch summary

~ubuntu-branches/ubuntu/trusty/digikam/trusty

« back to all changes in this revision

Viewing changes to core/utilities/advancedrename/advancedrenamedialog.cpp

  • Committer: Package Import Robot
  • Author(s): Rohan Garg
  • Date: 2012-11-26 18:24:20 UTC
  • mfrom: (1.9.1) (3.1.23 experimental)
  • Revision ID: package-import@ubuntu.com-20121126182420-qoy6z0nx4ai0wzcl
Tags: 4:3.0.0~beta3-0ubuntu1
https://launchpad.net/bugs/890059
https://launchpad.net/bugs/1011211
https://launchpad.net/bugs/658047
* New upstream release
  - Add build-deps :  libhupnp-dev, libqtgstreamer-dev, libmagickcore-dev
* Merge from debian, remaining changes:
  - Make sure libqt4-opengl-dev, libgl1-mesa-dev and libglu1-mesa-dev only
    install on i386,amd64 and powerpc
  - Depend on libtiff-dev instead of libtiff4-dev
  - Drop digikam breaks/replaces kipi-plugins-common since we're past the
    LTS release now
  - digikam to recommend mplayerthumbs | ffmpegthumbs. We currently only
    have latter in the archives, even though former is also supposed to
    be part of kdemultimedia. (LP: #890059)
  - kipi-plugins to recommend www-browser rather than konqueror directly
    since 2.8 no direct usage of konqueror is present in the flickr
    plugin anymore (LP: #1011211)
  - Keep kubuntu_mysqld_executable_name.diff
  - Don't install libkipi translations
  - Keep deps on libcv-dev, libcvaux-dev
  - Keep split packaging of libraries
  - Replace icons from KDE 3 time in debian/xpm.d/*.xpm with the new
    versions (LP: #658047)
* Update debian/not-installed

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/utilities/advancedrename/advancedrenamedialog.cpp
6
6
 * Date        : 2009-09-14
7
7
 * Description : a rename dialog for the AdvancedRename utility
8
8
 *
9
 
 * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
 
9
 * Copyright (C) 2009-2012 by Andi Clemens <andi dot clemens at gmail dot com>
10
10
 *
11
11
 * This program is free software; you can redistribute it
12
12
 * and/or modify it under the terms of the GNU General
54
54
namespace Digikam
55
55
{
56
56
 
57
 
class AdvancedRenameListItem::AdvancedRenameListItemPriv
 
57
class AdvancedRenameListItem::Private
58
58
{
59
59
public:
60
60
 
61
 
    AdvancedRenameListItemPriv()
 
61
    Private()
62
62
    {
63
63
    }
64
64
 
69
69
// --------------------------------------------------------
70
70
 
71
71
AdvancedRenameListItem::AdvancedRenameListItem(QTreeWidget* view)
72
 
    : QTreeWidgetItem(view), d(new AdvancedRenameListItemPriv)
 
72
    : QTreeWidgetItem(view), d(new Private)
73
73
{
74
74
}
75
75
 
76
76
AdvancedRenameListItem::AdvancedRenameListItem(QTreeWidget* view, const KUrl& url)
77
 
    : QTreeWidgetItem(view), d(new AdvancedRenameListItemPriv)
 
77
    : QTreeWidgetItem(view), d(new Private)
78
78
{
79
79
    setImageUrl(url);
80
80
}
134
134
 
135
135
// --------------------------------------------------------
136
136
 
137
 
class AdvancedRenameDialog::AdvancedRenameDialogPriv
 
137
class AdvancedRenameDialog::Private
138
138
{
139
139
public:
140
140
 
141
 
    AdvancedRenameDialogPriv() :
 
141
    Private() :
142
142
        singleFileMode(false),
143
143
        minSizeDialog(450),
144
144
        sortActionName(0),
177
177
    AdvancedRenameWidget*  advancedRenameWidget;
178
178
    NewNamesList           newNamesList;
179
179
};
180
 
const QString AdvancedRenameDialog::AdvancedRenameDialogPriv::configGroupName("AdvancedRename Dialog");
181
 
const QString AdvancedRenameDialog::AdvancedRenameDialogPriv::configLastUsedRenamePatternEntry("Last Used Rename Pattern");
182
 
const QString AdvancedRenameDialog::AdvancedRenameDialogPriv::configDialogSizeEntry("Dialog Size");
 
180
const QString AdvancedRenameDialog::Private::configGroupName("AdvancedRename Dialog");
 
181
const QString AdvancedRenameDialog::Private::configLastUsedRenamePatternEntry("Last Used Rename Pattern");
 
182
const QString AdvancedRenameDialog::Private::configDialogSizeEntry("Dialog Size");
183
183
 
184
184
// --------------------------------------------------------
185
185
 
186
186
AdvancedRenameDialog::AdvancedRenameDialog(QWidget* parent)
187
 
    : KDialog(parent), d(new AdvancedRenameDialogPriv)
 
187
    : KDialog(parent), d(new Private)
188
188
{
189
189
    d->advancedRenameManager  = new AdvancedRenameManager();
190
190
    d->advancedRenameWidget   = new AdvancedRenameWidget(this);