summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
commit3e2c82e9b8785f85689006cfd16115c7b40fa8cf (patch)
tree0b890d04821ae3075224275de714c885dc458e79
parentbcbc2b2a3e3aa0997c0f11e0bd090b8bac6732c2 (diff)
downloadkipi-plugins-3e2c82e9b8785f85689006cfd16115c7b40fa8cf.tar.gz
kipi-plugins-3e2c82e9b8785f85689006cfd16115c7b40fa8cf.zip
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/libraries/kipi-plugins@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kipi-plugins/batchprocessimages/renameimagesbase.ui2
-rw-r--r--kipi-plugins/calendar/caleventsbase.ui2
-rw-r--r--kipi-plugins/findimages/finddupplicateimages.cpp8
-rw-r--r--kipi-plugins/findimages/finddupplicateimages.h2
-rw-r--r--kipi-plugins/flickrexport/flickralbumdialog.ui2
-rw-r--r--kipi-plugins/flickrexport/flickritem.h6
-rw-r--r--kipi-plugins/flickrexport/flickrtalker.cpp2
-rw-r--r--kipi-plugins/flickrexport/flickrtalker.h2
-rw-r--r--kipi-plugins/flickrexport/flickrwindow.cpp4
-rw-r--r--kipi-plugins/galleryexport/galleryalbumdialog.ui2
-rw-r--r--kipi-plugins/galleryexport/galleryitem.h10
-rw-r--r--kipi-plugins/galleryexport/gallerytalker.cpp6
-rw-r--r--kipi-plugins/galleryexport/gallerytalker.h2
-rw-r--r--kipi-plugins/galleryexport/gallerywindow.cpp12
-rw-r--r--kipi-plugins/htmlexport/imagesettingspage.ui2
-rw-r--r--kipi-plugins/htmlexport/outputpage.ui2
-rw-r--r--kipi-plugins/htmlexport/themepage.ui2
-rw-r--r--kipi-plugins/htmlexport/themeparameterspage.ui2
-rw-r--r--kipi-plugins/imageviewer/help.ui2
-rw-r--r--kipi-plugins/kameraklient/camerafolderview.cpp6
-rw-r--r--kipi-plugins/kameraklient/gpcontroller.cpp30
-rw-r--r--kipi-plugins/kameraklient/gpcontroller.h2
-rw-r--r--kipi-plugins/mpegencoder/kimg2mpgbase.ui2
-rw-r--r--kipi-plugins/picasawebexport/PicasawebNewAlbumDialog.ui2
-rw-r--r--kipi-plugins/picasawebexport/picasawebitem.h6
-rw-r--r--kipi-plugins/picasawebexport/uploadwidget.ui2
-rw-r--r--kipi-plugins/printwizard/frmprintwizard.cpp284
-rw-r--r--kipi-plugins/printwizard/frmprintwizard.h10
-rw-r--r--kipi-plugins/printwizard/frmprintwizardbase.ui2
-rw-r--r--kipi-plugins/slideshow/imageloadthread.cpp4
-rw-r--r--kipi-plugins/slideshow/imageloadthread.h2
-rw-r--r--kipi-plugins/slideshow/slideshowconfigbase.ui2
-rw-r--r--kipi-plugins/sync/galleryalbumdialog.ui2
-rw-r--r--kipi-plugins/sync/galleryitem.h10
-rw-r--r--kipi-plugins/sync/gallerywindow.cpp12
-rw-r--r--kipi-plugins/sync/sinklistbase.ui4
-rw-r--r--kipi-plugins/sync/sinks/gallery/gallerysink.cpp6
-rw-r--r--kipi-plugins/sync/sinks/gallery/gallerysink.h2
38 files changed, 231 insertions, 231 deletions
diff --git a/kipi-plugins/batchprocessimages/renameimagesbase.ui b/kipi-plugins/batchprocessimages/renameimagesbase.ui
index cbdf1a1..168625f 100644
--- a/kipi-plugins/batchprocessimages/renameimagesbase.ui
+++ b/kipi-plugins/batchprocessimages/renameimagesbase.ui
@@ -352,7 +352,7 @@
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="6"/>
+<layoutdefaults spacing="6" margin="6"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>
diff --git a/kipi-plugins/calendar/caleventsbase.ui b/kipi-plugins/calendar/caleventsbase.ui
index d621867..d9aa2cb 100644
--- a/kipi-plugins/calendar/caleventsbase.ui
+++ b/kipi-plugins/calendar/caleventsbase.ui
@@ -202,7 +202,7 @@ This is fully optional. All the events from this calendar will be printed green.
<slot>fhChooseSlot()</slot>
<slot>ohChooseSlot()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kipi-plugins/findimages/finddupplicateimages.cpp b/kipi-plugins/findimages/finddupplicateimages.cpp
index d8bcee3..de977ac 100644
--- a/kipi-plugins/findimages/finddupplicateimages.cpp
+++ b/kipi-plugins/findimages/finddupplicateimages.cpp
@@ -80,7 +80,7 @@ FindDuplicateImages::FindDuplicateImages( KIPI::Interface* interface, TQObject *
m_compareOp( 0 )
{
KImageIO::registerFormats();
- tqparent_ = tqparent;
+ parent_ = tqparent;
}
@@ -203,12 +203,12 @@ void FindDuplicateImages::compareAlbums(void)
if ( m_findDuplicateDialog->getFindMethod() == FindDuplicateDialog::MethodAlmost )
{
- FuzzyCompare *op = new FuzzyCompare( tqparent_, m_cacheDir );
+ FuzzyCompare *op = new FuzzyCompare( parent_, m_cacheDir );
op->setApproximateThreeshold( m_approximateLevel );
m_compareOp = op;
}
else
- m_compareOp = new FastCompare( tqparent_ );
+ m_compareOp = new FastCompare( parent_ );
start(); // Starting the thread.
@@ -222,7 +222,7 @@ void FindDuplicateImages::compareAlbums(void)
void FindDuplicateImages::run()
{
m_res = m_compareOp->compare(filesList );
- sendMessage( tqparent_, KIPIFindDupplicateImagesPlugin::Progress, TQString(), 0, false, true );
+ sendMessage( parent_, KIPIFindDupplicateImagesPlugin::Progress, TQString(), 0, false, true );
}
diff --git a/kipi-plugins/findimages/finddupplicateimages.h b/kipi-plugins/findimages/finddupplicateimages.h
index 8de237c..d3bc868 100644
--- a/kipi-plugins/findimages/finddupplicateimages.h
+++ b/kipi-plugins/findimages/finddupplicateimages.h
@@ -89,7 +89,7 @@ protected:
bool deldir(TQString dirname);
TQStringList filesList;
- TQObject *tqparent_;
+ TQObject *parent_;
TQDict < TQPtrVector < TQFile > > m_res;
KIPI::Interface* m_interface;
TQString m_cacheDir;
diff --git a/kipi-plugins/flickrexport/flickralbumdialog.ui b/kipi-plugins/flickrexport/flickralbumdialog.ui
index 968ede6..20d5749 100644
--- a/kipi-plugins/flickrexport/flickralbumdialog.ui
+++ b/kipi-plugins/flickrexport/flickralbumdialog.ui
@@ -193,5 +193,5 @@
<slot>reject()</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kipi-plugins/flickrexport/flickritem.h b/kipi-plugins/flickrexport/flickritem.h
index 96bf513..ffeaf37 100644
--- a/kipi-plugins/flickrexport/flickritem.h
+++ b/kipi-plugins/flickrexport/flickritem.h
@@ -89,7 +89,7 @@ public:
GAlbum()
{
ref_num = -1;
- tqparent_ref_num = -1;
+ parent_ref_num = -1;
add = false;
write = false;
@@ -105,10 +105,10 @@ public:
bool create_sub;
int ref_num;
- int tqparent_ref_num;
+ int parent_ref_num;
TQString name;
- TQString tqparentName;
+ TQString parentName;
TQString title;
TQString summary;
TQString baseurl;
diff --git a/kipi-plugins/flickrexport/flickrtalker.cpp b/kipi-plugins/flickrexport/flickrtalker.cpp
index 7da02ce..c3b83a9 100644
--- a/kipi-plugins/flickrexport/flickrtalker.cpp
+++ b/kipi-plugins/flickrexport/flickrtalker.cpp
@@ -321,7 +321,7 @@ void FlickrTalker::listPhotos(const TQString& /*albumName*/)
// TODO
}
-void FlickrTalker::createAlbum(const TQString& /*tqparentAlbumName*/, const TQString& /*albumName*/,
+void FlickrTalker::createAlbum(const TQString& /*parentAlbumName*/, const TQString& /*albumName*/,
const TQString& /*albumTitle*/, const TQString& /*albumCaption*/)
{
//TODO: The equivalent for Album is sets.
diff --git a/kipi-plugins/flickrexport/flickrtalker.h b/kipi-plugins/flickrexport/flickrtalker.h
index 6205fef..3482030 100644
--- a/kipi-plugins/flickrexport/flickrtalker.h
+++ b/kipi-plugins/flickrexport/flickrtalker.h
@@ -81,7 +81,7 @@ public:
void listPhotoSets();
void listPhotos(const TQString& albumName);
- void createAlbum(const TQString& tqparentAlbumName,
+ void createAlbum(const TQString& parentAlbumName,
const TQString& albumName,
const TQString& albumTitle,
const TQString& albumCaption);
diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp
index 8b16801..a619157 100644
--- a/kipi-plugins/flickrexport/flickrwindow.cpp
+++ b/kipi-plugins/flickrexport/flickrwindow.cpp
@@ -343,7 +343,7 @@ void FlickrWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
{
const GAlbum& album = *iter;
- if ( album.tqparent_ref_num == 0 )
+ if ( album.parent_ref_num == 0 )
{
GAlbumViewItem* item = new GAlbumViewItem( m_tagView, album.name,
album );
@@ -352,7 +352,7 @@ void FlickrWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
}
else
{
- TQListViewItem* tqparent = m_albumDict.tqfind( album.tqparent_ref_num );
+ TQListViewItem* tqparent = m_albumDict.tqfind( album.parent_ref_num );
if ( tqparent )
{
GAlbumViewItem* item = new GAlbumViewItem( tqparent, album.name,
diff --git a/kipi-plugins/galleryexport/galleryalbumdialog.ui b/kipi-plugins/galleryexport/galleryalbumdialog.ui
index e925fa5..26ee8d9 100644
--- a/kipi-plugins/galleryexport/galleryalbumdialog.ui
+++ b/kipi-plugins/galleryexport/galleryalbumdialog.ui
@@ -193,5 +193,5 @@
<slot>reject()</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kipi-plugins/galleryexport/galleryitem.h b/kipi-plugins/galleryexport/galleryitem.h
index a752698..9a1c839 100644
--- a/kipi-plugins/galleryexport/galleryitem.h
+++ b/kipi-plugins/galleryexport/galleryitem.h
@@ -51,7 +51,7 @@ public:
GAlbum()
{
ref_num = -1;
- tqparent_ref_num = -1;
+ parent_ref_num = -1;
add = false;
write = false;
@@ -62,16 +62,16 @@ public:
bool operator<(const GAlbum& rhs) const
{
- if (tqparent_ref_num == rhs.tqparent_ref_num)
+ if (parent_ref_num == rhs.parent_ref_num)
return ref_num < rhs.ref_num;
- return tqparent_ref_num < rhs.tqparent_ref_num;
+ return parent_ref_num < rhs.parent_ref_num;
}
int ref_num;
- int tqparent_ref_num;
+ int parent_ref_num;
TQString name;
- TQString tqparentName;
+ TQString parentName;
TQString title;
TQString summary;
TQString baseurl;
diff --git a/kipi-plugins/galleryexport/gallerytalker.cpp b/kipi-plugins/galleryexport/gallerytalker.cpp
index 10043dd..4b2fda8 100644
--- a/kipi-plugins/galleryexport/gallerytalker.cpp
+++ b/kipi-plugins/galleryexport/gallerytalker.cpp
@@ -148,7 +148,7 @@ void GalleryTalker::listPhotos( const TQString& albumName )
emit signalBusy( true );
}
-void GalleryTalker::createAlbum( const TQString& tqparentAlbumName,
+void GalleryTalker::createAlbum( const TQString& parentAlbumName,
const TQString& albumName,
const TQString& albumTitle,
const TQString& albumCaption )
@@ -163,7 +163,7 @@ void GalleryTalker::createAlbum( const TQString& tqparentAlbumName,
form.addPair("cmd", "new-album");
form.addPair("protocol_version", "2.11");
- form.addPair("set_albumName", tqparentAlbumName);
+ form.addPair("set_albumName", parentAlbumName);
if (!albumName.isEmpty())
form.addPair("newAlbumName", albumName);
if (!albumTitle.isEmpty())
@@ -432,7 +432,7 @@ void GalleryTalker::parseResponseListAlbums(const TQByteArray &data)
else if (key.startsWith("album.tqparent"))
{
if (iter != albumList.end())
- (*iter).tqparent_ref_num = value.toInt();
+ (*iter).parent_ref_num = value.toInt();
}
else if (key.startsWith("album.perms.add"))
{
diff --git a/kipi-plugins/galleryexport/gallerytalker.h b/kipi-plugins/galleryexport/gallerytalker.h
index d3a4c41..3cc876b 100644
--- a/kipi-plugins/galleryexport/gallerytalker.h
+++ b/kipi-plugins/galleryexport/gallerytalker.h
@@ -65,7 +65,7 @@ public:
const TQString& passwd );
void listAlbums();
void listPhotos( const TQString& albumName );
- void createAlbum( const TQString& tqparentAlbumName,
+ void createAlbum( const TQString& parentAlbumName,
const TQString& albumName,
const TQString& albumTitle,
const TQString& albumCaption );
diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp
index fb90a36..8d17753 100644
--- a/kipi-plugins/galleryexport/gallerywindow.cpp
+++ b/kipi-plugins/galleryexport/gallerywindow.cpp
@@ -291,7 +291,7 @@ void GalleryWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
{
const GAlbum& album = *iter;
- if ( album.tqparent_ref_num == 0 )
+ if ( album.parent_ref_num == 0 )
{
GAlbumViewItem* item = new GAlbumViewItem( m_albumView, album.title,
album );
@@ -300,7 +300,7 @@ void GalleryWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
}
else
{
- TQListViewItem* tqparent = m_albumDict.tqfind( album.tqparent_ref_num );
+ TQListViewItem* tqparent = m_albumDict.tqfind( album.parent_ref_num );
if ( tqparent )
{
GAlbumViewItem* item = new GAlbumViewItem( tqparent, album.title,
@@ -533,20 +533,20 @@ void GalleryWindow::slotNewAlbum()
return;
}
- TQString tqparentAlbumName;
+ TQString parentAlbumName;
TQListViewItem* item = m_albumView->selectedItem();
if (item)
{
GAlbumViewItem* viewItem = static_cast<GAlbumViewItem*>(item);
- tqparentAlbumName = viewItem->album.name;
+ parentAlbumName = viewItem->album.name;
}
else
{
- tqparentAlbumName = "0";
+ parentAlbumName = "0";
}
- m_talker->createAlbum(tqparentAlbumName, name, title, caption);
+ m_talker->createAlbum(parentAlbumName, name, title, caption);
}
void GalleryWindow::slotAddPhotos()
diff --git a/kipi-plugins/htmlexport/imagesettingspage.ui b/kipi-plugins/htmlexport/imagesettingspage.ui
index c5d1989..d200786 100644
--- a/kipi-plugins/htmlexport/imagesettingspage.ui
+++ b/kipi-plugins/htmlexport/imagesettingspage.ui
@@ -452,5 +452,5 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kipi-plugins/htmlexport/outputpage.ui b/kipi-plugins/htmlexport/outputpage.ui
index 42fbc60..6ece24d 100644
--- a/kipi-plugins/htmlexport/outputpage.ui
+++ b/kipi-plugins/htmlexport/outputpage.ui
@@ -74,7 +74,7 @@
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kipi-plugins/htmlexport/themepage.ui b/kipi-plugins/htmlexport/themepage.ui
index 8ec9897..ac89e30 100644
--- a/kipi-plugins/htmlexport/themepage.ui
+++ b/kipi-plugins/htmlexport/themepage.ui
@@ -33,7 +33,7 @@
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistbox.h</includehint>
<includehint>ktextbrowser.h</includehint>
diff --git a/kipi-plugins/htmlexport/themeparameterspage.ui b/kipi-plugins/htmlexport/themeparameterspage.ui
index 07258fa..2d05fda 100644
--- a/kipi-plugins/htmlexport/themeparameterspage.ui
+++ b/kipi-plugins/htmlexport/themeparameterspage.ui
@@ -88,5 +88,5 @@
</spacer>
</grid>
</widget>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
</UI>
diff --git a/kipi-plugins/imageviewer/help.ui b/kipi-plugins/imageviewer/help.ui
index a4f436f..14654af 100644
--- a/kipi-plugins/imageviewer/help.ui
+++ b/kipi-plugins/imageviewer/help.ui
@@ -118,5 +118,5 @@
<Q_SLOTS>
<slot>pushButton1_clicked()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kipi-plugins/kameraklient/camerafolderview.cpp b/kipi-plugins/kameraklient/camerafolderview.cpp
index c7d31b6..8357ca3 100644
--- a/kipi-plugins/kameraklient/camerafolderview.cpp
+++ b/kipi-plugins/kameraklient/camerafolderview.cpp
@@ -62,14 +62,14 @@ void CameraFolderView::addRootFolder(const TQString& folder) {
}
CameraFolderItem* CameraFolderView::addFolder(const TQString& folder, const TQString& subFolder) {
- CameraFolderItem *tqparentItem = findFolder(folder);
- if (tqparentItem) {
+ CameraFolderItem *parentItem = findFolder(folder);
+ if (parentItem) {
TQString path(folder);
if (!folder.endsWith("/")) {
path += "/";
}
path += subFolder;
- CameraFolderItem* item = new CameraFolderItem(tqparentItem, subFolder, path);
+ CameraFolderItem* item = new CameraFolderItem(parentItem, subFolder, path);
item->setOpen(true);
return item;
} else {
diff --git a/kipi-plugins/kameraklient/gpcontroller.cpp b/kipi-plugins/kameraklient/gpcontroller.cpp
index 4d27d68..ce209ec 100644
--- a/kipi-plugins/kameraklient/gpcontroller.cpp
+++ b/kipi-plugins/kameraklient/gpcontroller.cpp
@@ -44,7 +44,7 @@ namespace KIPIKameraKlientPlugin
{
GPController::GPController(TQObject *tqparent, const CameraType& ctype) : TQObject(tqparent) {
- tqparent_ = tqparent;
+ parent_ = tqparent;
camera_ = new GPCamera(TQString(ctype.model().latin1()), TQString(ctype.port().latin1()));
close_ = false;
connect(GPMessages::gpMessagesWrapper(), TQT_SIGNAL(statusChanged(const TQString&)),
@@ -223,7 +223,7 @@ void GPController::initialize() {
int result = camera_->initialize();
mutex_.unlock();
if (result == GPCamera::GPSuccess) {
- TQApplication::postEvent(tqparent_, new GPEvent(GPEvent::Init));
+ TQApplication::postEvent(parent_, new GPEvent(GPEvent::Init));
}
else if (result == GPCamera::GPSetup) {
TQString msg(i18n("Camera Model or Port not specified correctly.\n" "Please run Setup"));
@@ -241,7 +241,7 @@ void GPController::getSubFolders(const TQString& folder) {
int result = camera_->getSubFolders(folder, subFolderList);
mutex_.unlock();
if (result == GPCamera::GPSuccess) {
- TQApplication::postEvent(tqparent_, new GPEventGetSubFolders(folder, subFolderList));
+ TQApplication::postEvent(parent_, new GPEventGetSubFolders(folder, subFolderList));
if (subFolderList.count() > 0) {
for (unsigned int i=0; i<subFolderList.count(); i++) {
TQString subFolder(folder);
@@ -273,7 +273,7 @@ void GPController::getItemsInfo(const TQString& folder) {
int result = camera_->getItemsInfo(folder, infoList);
mutex_.unlock();
if (result == GPCamera::GPSuccess) {
- TQApplication::postEvent(tqparent_, new GPEventGetItemsInfo(folder, infoList));
+ TQApplication::postEvent(parent_, new GPEventGetItemsInfo(folder, infoList));
} else {
TQString msg(i18n("Failed to get images information from '%1'\n").tqarg(folder));
error(msg);
@@ -286,7 +286,7 @@ void GPController::getAllItemsInfo(const TQString& folder) {
mutex_.lock();
camera_->getAllItemsInfo(folder, infoList);
mutex_.unlock();
- TQApplication::postEvent(tqparent_, new GPEventGetAllItemsInfo(infoList));
+ TQApplication::postEvent(parent_, new GPEventGetAllItemsInfo(infoList));
}
void GPController::getThumbnail(const TQString& folder, const TQString& imageName) {
@@ -296,7 +296,7 @@ void GPController::getThumbnail(const TQString& folder, const TQString& imageNam
mutex_.unlock();
if (result == GPCamera::GPSuccess) {
scaleHighlightThumbnail(thumbnail);
- TQApplication::postEvent(tqparent_, new GPEventGetThumbnail(folder, imageName, thumbnail));
+ TQApplication::postEvent(parent_, new GPEventGetThumbnail(folder, imageName, thumbnail));
} else {
kdWarning() << i18n("Failed to get preview for '%1/%2'").tqarg(folder).tqarg(imageName) << endl;
}
@@ -310,7 +310,7 @@ void GPController::downloadItem(const TQString& folder, const TQString& itemName
TQString msg(i18n("Failed to download '%1' from '%2'").tqarg(itemName).tqarg(folder));
error(msg);
} else {
- TQApplication::postEvent(tqparent_, new GPEventDownloadItem(folder, itemName));
+ TQApplication::postEvent(parent_, new GPEventDownloadItem(folder, itemName));
}
}
@@ -322,7 +322,7 @@ void GPController::openItem(const TQString& folder, const TQString& itemName, co
TQString msg(i18n("Failed to open '%1'").tqarg(itemName));
error(msg);
} else {
- TQApplication::postEvent(tqparent_, new GPEventOpenItem(saveFile));
+ TQApplication::postEvent(parent_, new GPEventOpenItem(saveFile));
}
}
@@ -334,7 +334,7 @@ void GPController::openItemWithService(const TQString& folder, const TQString& i
TQString msg(i18n("Failed to open '%1'").tqarg(itemName));
error(msg);
} else {
- TQApplication::postEvent(tqparent_, new GPEventOpenItemWithService(saveFile, serviceName));
+ TQApplication::postEvent(parent_, new GPEventOpenItemWithService(saveFile, serviceName));
}
}
@@ -346,7 +346,7 @@ void GPController::deleteItem(const TQString& folder, const TQString& itemName)
TQString msg(i18n("Failed to delete '%1'").tqarg(itemName));
error(msg);
} else {
- TQApplication::postEvent(tqparent_, new GPEventDeleteItem(folder, itemName));
+ TQApplication::postEvent(parent_, new GPEventDeleteItem(folder, itemName));
}
}
@@ -375,7 +375,7 @@ void GPController::uploadItem(const TQString& folder, const TQString& uploadName
}
}
if (!infoList2.isEmpty()) {
- TQApplication::postEvent(tqparent_, new GPEventGetItemsInfo(folder, infoList2));
+ TQApplication::postEvent(parent_, new GPEventGetItemsInfo(folder, infoList2));
}
}
}
@@ -383,7 +383,7 @@ void GPController::uploadItem(const TQString& folder, const TQString& uploadName
void GPController::error(const TQString& errorMsg) {
kdWarning() << errorMsg;
- TQApplication::postEvent(tqparent_, new GPEventError(errorMsg));
+ TQApplication::postEvent(parent_, new GPEventError(errorMsg));
}
void GPController::scaleHighlightThumbnail(TQImage& thumbnail) {
@@ -428,12 +428,12 @@ void GPController::scaleHighlightThumbnail(TQImage& thumbnail) {
void GPController::slotStatusMsg(const TQString& msg) {
if (!msg.isEmpty()) {
- TQApplication::postEvent(tqparent_, new GPEventStatusMsg(msg));
+ TQApplication::postEvent(parent_, new GPEventStatusMsg(msg));
}
}
void GPController::slotProgressVal(int val) {
- TQApplication::postEvent(tqparent_, new GPEventProgress(val));
+ TQApplication::postEvent(parent_, new GPEventProgress(val));
}
void GPController::slotErrorMsg(const TQString& msg) {
@@ -441,7 +441,7 @@ void GPController::slotErrorMsg(const TQString& msg) {
}
void GPController::showBusy(bool val) {
- TQApplication::postEvent(tqparent_, new GPEventBusy(val));
+ TQApplication::postEvent(parent_, new GPEventBusy(val));
}
void GPController::getInformation(TQString& summary, TQString& manual, TQString& about) {
diff --git a/kipi-plugins/kameraklient/gpcontroller.h b/kipi-plugins/kameraklient/gpcontroller.h
index 465900d..d925251 100644
--- a/kipi-plugins/kameraklient/gpcontroller.h
+++ b/kipi-plugins/kameraklient/gpcontroller.h
@@ -83,7 +83,7 @@ private:
void scaleHighlightThumbnail(TQImage& thumbnail);
void showBusy(bool val);
- TQObject *tqparent_;
+ TQObject *parent_;
GPCamera *camera_;
TQMutex mutex_;
MTQueue<GPCommand> cmdQueue_;
diff --git a/kipi-plugins/mpegencoder/kimg2mpgbase.ui b/kipi-plugins/mpegencoder/kimg2mpgbase.ui
index c0152ab..3971d45 100644
--- a/kipi-plugins/mpegencoder/kimg2mpgbase.ui
+++ b/kipi-plugins/mpegencoder/kimg2mpgbase.ui
@@ -1330,7 +1330,7 @@ The program uses the 'images2mpg' bash script.</string>
<function specifier="non virtual">writeSettings()</function>
<function specifier="non virtual">readSettings()</function>
</functions>
-<tqlayoutdefaults spacing="6" margin="6"/>
+<layoutdefaults spacing="6" margin="6"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>kimg2mpg.h</includehint>
diff --git a/kipi-plugins/picasawebexport/PicasawebNewAlbumDialog.ui b/kipi-plugins/picasawebexport/PicasawebNewAlbumDialog.ui
index 55a801e..b2b13d1 100644
--- a/kipi-plugins/picasawebexport/PicasawebNewAlbumDialog.ui
+++ b/kipi-plugins/picasawebexport/PicasawebNewAlbumDialog.ui
@@ -233,5 +233,5 @@
<slot access="protected" specifier="non virtual">creatAlbumSlot()</slot>
<slot access="protected" specifier="non virtual">cancelWindowSlot()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kipi-plugins/picasawebexport/picasawebitem.h b/kipi-plugins/picasawebexport/picasawebitem.h
index c89bb5d..2a66f1a 100644
--- a/kipi-plugins/picasawebexport/picasawebitem.h
+++ b/kipi-plugins/picasawebexport/picasawebitem.h
@@ -84,7 +84,7 @@ public:
GAlbum()
{
ref_num = -1;
- tqparent_ref_num = -1;
+ parent_ref_num = -1;
add = false;
write = false;
@@ -94,7 +94,7 @@ public:
}
int ref_num;
- int tqparent_ref_num;
+ int parent_ref_num;
bool add;
bool write;
@@ -103,7 +103,7 @@ public:
bool create_sub;
TQString name;
- TQString tqparentName;
+ TQString parentName;
TQString title;
TQString summary;
TQString baseurl;
diff --git a/kipi-plugins/picasawebexport/uploadwidget.ui b/kipi-plugins/picasawebexport/uploadwidget.ui
index 22e711b..35f30ae 100644
--- a/kipi-plugins/picasawebexport/uploadwidget.ui
+++ b/kipi-plugins/picasawebexport/uploadwidget.ui
@@ -438,5 +438,5 @@
</widget>
</widget>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp
index 29ae448..2691bf2 100644
--- a/kipi-plugins/printwizard/frmprintwizard.cpp
+++ b/kipi-plugins/printwizard/frmprintwizard.cpp
@@ -360,7 +360,7 @@ void FrmPrintWizard::FrmPrintWizardBaseSelected(const TQString &)
printer.setUsePrinterResolution(true);
#endif
if (printer.setup())
- printPhotos(m_photos, s->tqlayouts, printer);
+ printPhotos(m_photos, s->layouts, printer);
}
else
if (RdoOutputFile->isChecked())
@@ -395,11 +395,11 @@ void FrmPrintWizard::FrmPrintWizardBaseSelected(const TQString &)
}
}
-double getMaxDPI(TQPtrList<TPhoto> photos, TQPtrList<TQRect> tqlayouts, unsigned int current)
+double getMaxDPI(TQPtrList<TPhoto> photos, TQPtrList<TQRect> layouts, unsigned int current)
{
- Q_ASSERT(tqlayouts.count() > 1);
+ Q_ASSERT(layouts.count() > 1);
- TQRect *tqlayout = tqlayouts.at(1);
+ TQRect *tqlayout = layouts.at(1);
double maxDPI = 0.0;
@@ -411,7 +411,7 @@ double getMaxDPI(TQPtrList<TPhoto> photos, TQPtrList<TQRect> tqlayouts, unsigned
if (dpi > maxDPI)
maxDPI = dpi;
// iterate to the next position
- tqlayout = tqlayouts.next();
+ tqlayout = layouts.next();
if (tqlayout == 0)
{
break;
@@ -427,13 +427,13 @@ TQRect * FrmPrintWizard::getLayout(int photoIndex)
// how many photos would actually be printed, including copies?
int photoCount = (photoIndex + 1);
// how many pages? Recall that the first tqlayout item is the paper size
- int photosPerPage = s->tqlayouts.count() - 1;
+ int photosPerPage = s->layouts.count() - 1;
int remainder = photoCount % photosPerPage;
int retVal = remainder;
if (remainder == 0)
retVal = photosPerPage;
- return s->tqlayouts.at(retVal);
+ return s->layouts.at(retVal);
}
int FrmPrintWizard::getPageCount()
@@ -443,7 +443,7 @@ int FrmPrintWizard::getPageCount()
int photoCount = m_photos.count();
// how many pages? Recall that the first tqlayout item is the paper size
- int photosPerPage = s->tqlayouts.count() - 1;
+ int photosPerPage = s->layouts.count() - 1;
int remainder = photoCount % photosPerPage;
int emptySlots = 0;
if (remainder > 0)
@@ -566,15 +566,15 @@ TQString FrmPrintWizard::captionFormatter(TPhoto *photo, const TQString& format)
return str;
}
-bool FrmPrintWizard::paintOnePage(TQPainter &p, TQPtrList<TPhoto> photos, TQPtrList<TQRect> tqlayouts,
+bool FrmPrintWizard::paintOnePage(TQPainter &p, TQPtrList<TPhoto> photos, TQPtrList<TQRect> layouts,
int captionType, unsigned int &current, bool useThumbnails)
{
- Q_ASSERT(tqlayouts.count() > 1);
+ Q_ASSERT(layouts.count() > 1);
if (photos.count() == 0) return true; // no photos => last photo
- TQRect *srcPage = tqlayouts.at(0);
- TQRect *tqlayout = tqlayouts.at(1);
+ TQRect *srcPage = layouts.at(0);
+ TQRect *tqlayout = layouts.at(1);
// scale the page size to best fit the painter
// size the rectangle based on the minimum image dimension
@@ -742,7 +742,7 @@ bool FrmPrintWizard::paintOnePage(TQPainter &p, TQPtrList<TPhoto> photos, TQPtrL
} // caption
// iterate to the next position
- tqlayout = tqlayouts.next();
+ tqlayout = layouts.next();
if (tqlayout == 0)
{
current++;
@@ -760,13 +760,13 @@ bool FrmPrintWizard::paintOnePage(TQPainter &p, TQPtrList<TPhoto> photos, TQPtrL
// to use a TQPixmap, which will have the same bit depth as the display.
// So someone with an 8-bit display would not be able to save 24-bit
// images!
-bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrList<TQRect> tqlayouts,
+bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrList<TQRect> layouts,
int captionType, unsigned int &current)
{
- Q_ASSERT(tqlayouts.count() > 1);
+ Q_ASSERT(layouts.count() > 1);
- TQRect *srcPage = tqlayouts.at(0);
- TQRect *tqlayout = tqlayouts.at(1);
+ TQRect *srcPage = layouts.at(0);
+ TQRect *tqlayout = layouts.at(1);
// scale the page size to best fit the painter
// size the rectangle based on the minimum image dimension
@@ -929,7 +929,7 @@ bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrLis
} // caption
// iterate to the next position
- tqlayout = tqlayouts.next();
+ tqlayout = layouts.next();
if (tqlayout == 0)
{
current++;
@@ -949,7 +949,7 @@ void FrmPrintWizard::previewPhotos()
int photoCount = m_photos.count();
// how many pages? Recall that the first tqlayout item is the paper size
- int photosPerPage = s->tqlayouts.count() - 1;
+ int photosPerPage = s->layouts.count() - 1;
int remainder = photoCount % photosPerPage;
int emptySlots = 0;
if (remainder > 0)
@@ -973,8 +973,8 @@ void FrmPrintWizard::previewPhotos()
if (page == m_currentPreviewPage) {
photo->cropRegion.setRect(-1, -1, -1, -1);
photo->rotation = 0;
- int w = s->tqlayouts.at(count+1)->width();
- int h = s->tqlayouts.at(count+1)->height();
+ int w = s->layouts.at(count+1)->width();
+ int h = s->layouts.at(count+1)->height();
cropFrame->init(photo, w, h, s->autoRotate, false);
}
count++;
@@ -993,7 +993,7 @@ void FrmPrintWizard::previewPhotos()
TQPainter p;
p.begin(&img);
p.fillRect(0, 0, img.width(), img.height(), this->paletteBackgroundColor());
- paintOnePage(p, m_photos, s->tqlayouts, m_captions->currentItem(), current, true);
+ paintOnePage(p, m_photos, s->layouts, m_captions->currentItem(), current, true);
p.end();
BmpFirstPagePreview->setPixmap(img);
LblPreview->setText(i18n("Page ") + TQString::number(m_currentPreviewPage + 1) + i18n(" of ") + TQString::number(getPageCount()));
@@ -1171,7 +1171,7 @@ void FrmPrintWizard::reject()
TQDialog::reject();
}
-void FrmPrintWizard::printPhotos(TQPtrList<TPhoto> photos, TQPtrList<TQRect> tqlayouts, KPrinter &printer)
+void FrmPrintWizard::printPhotos(TQPtrList<TPhoto> photos, TQPtrList<TQRect> layouts, KPrinter &printer)
{
m_cancelPrinting = false;
LblPrintProgress->setText("");
@@ -1188,7 +1188,7 @@ void FrmPrintWizard::printPhotos(TQPtrList<TPhoto> photos, TQPtrList<TQRect> tql
bool printing = true;
while(printing)
{
- printing = paintOnePage(p, photos, tqlayouts, m_captions->currentItem(), current);
+ printing = paintOnePage(p, photos, layouts, m_captions->currentItem(), current);
if (printing)
printer.newPage();
PrgPrintProgress->setProgress(current);
@@ -1208,9 +1208,9 @@ void FrmPrintWizard::printPhotos(TQPtrList<TPhoto> photos, TQPtrList<TQRect> tql
LblPrintProgress->setText(i18n("Complete. Click Finish to exit the Print Wizard."));
}
-TQStringList FrmPrintWizard::printPhotosToFile(TQPtrList<TPhoto> photos, TQString &baseFilename, TPhotoSize* tqlayouts)
+TQStringList FrmPrintWizard::printPhotosToFile(TQPtrList<TPhoto> photos, TQString &baseFilename, TPhotoSize* layouts)
{
- Q_ASSERT(tqlayouts->tqlayouts.count() > 1);
+ Q_ASSERT(layouts->layouts.count() > 1);
m_cancelPrinting = false;
LblPrintProgress->setText("");
@@ -1224,15 +1224,15 @@ TQStringList FrmPrintWizard::printPhotosToFile(TQPtrList<TPhoto> photos, TQStrin
bool printing = true;
TQStringList files;
- TQRect *srcPage = tqlayouts->tqlayouts.at(0);
+ TQRect *srcPage = layouts->layouts.at(0);
while (printing)
{
// make a pixmap to save to file. Make it just big enough to show the
// highest-dpi image on the page without losing data.
- double dpi = tqlayouts->dpi;
+ double dpi = layouts->dpi;
if (dpi == 0.0)
- dpi = getMaxDPI(photos, tqlayouts->tqlayouts, current) * 1.1;
+ dpi = getMaxDPI(photos, layouts->layouts, current) * 1.1;
int w = NINT(srcPage->width() / 1000.0 * dpi);
int h = NINT(srcPage->height() / 1000.0 * dpi);
TQImage *img = new TQImage(w, h, 32);
@@ -1258,7 +1258,7 @@ TQStringList FrmPrintWizard::printPhotosToFile(TQPtrList<TPhoto> photos, TQStrin
// paint this page, even if we aren't saving it to keep the page
// count accurate.
- printing = paintOnePage(*img, photos, tqlayouts->tqlayouts, m_captions->currentItem(), current);
+ printing = paintOnePage(*img, photos, layouts->layouts, m_captions->currentItem(), current);
if (saveFile)
{
@@ -1535,13 +1535,13 @@ TPhotoSize * createPhotoGrid(int pageWidth, int pageHeight, TQString label, int
p->label = label;
p->dpi = 100;
p->autoRotate = false;
- p->tqlayouts.append(new TQRect(0, 0, pageWidth, pageHeight));
+ p->layouts.append(new TQRect(0, 0, pageWidth, pageHeight));
int row = 0;
for(int y=MARGIN; row < rows && y < pageHeight - MARGIN; y += photoHeight + GAP) {
int col = 0;
for(int x=MARGIN; col < columns && x < pageWidth - MARGIN; x += photoWidth + GAP) {
- p->tqlayouts.append(new TQRect(x, y, photoWidth, photoHeight));
+ p->layouts.append(new TQRect(x, y, photoWidth, photoHeight));
col++;
}
row++;
@@ -1575,12 +1575,12 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->dpi = 0;
p->autoRotate = true;
// page size
- p->tqlayouts.append(new TQRect(0, 0, 8500, 11000));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect( 700, 500, 3500, 5000));
- p->tqlayouts.append(new TQRect(4300, 500, 3500, 5000));
- p->tqlayouts.append(new TQRect( 700, 5600, 3500, 5000));
- p->tqlayouts.append(new TQRect(4300, 5600, 3500, 5000));
+ p->layouts.append(new TQRect(0, 0, 8500, 11000));
+ // photo layouts
+ p->layouts.append(new TQRect( 700, 500, 3500, 5000));
+ p->layouts.append(new TQRect(4300, 500, 3500, 5000));
+ p->layouts.append(new TQRect( 700, 5600, 3500, 5000));
+ p->layouts.append(new TQRect(4300, 5600, 3500, 5000));
// add to the list
m_photoSizes.append(p);
@@ -1590,11 +1590,11 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->dpi = 0;
p->autoRotate = true;
// page size
- p->tqlayouts.append(new TQRect(0, 0, 8500, 11000));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect( 225, 500, 4000, 6000));
- p->tqlayouts.append(new TQRect(4275, 500, 4000, 6000));
- p->tqlayouts.append(new TQRect(1250, 6600, 6000, 4000));
+ p->layouts.append(new TQRect(0, 0, 8500, 11000));
+ // photo layouts
+ p->layouts.append(new TQRect( 225, 500, 4000, 6000));
+ p->layouts.append(new TQRect(4275, 500, 4000, 6000));
+ p->layouts.append(new TQRect(1250, 6600, 6000, 4000));
// add to the list
m_photoSizes.append(p);
@@ -1604,10 +1604,10 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->dpi = 0;
p->autoRotate = true;
// page size
- p->tqlayouts.append(new TQRect(0, 0, 8500, 11000));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect( 1250, 1000, 6000, 4000));
- p->tqlayouts.append(new TQRect( 1250, 6000, 6000, 4000));
+ p->layouts.append(new TQRect(0, 0, 8500, 11000));
+ // photo layouts
+ p->layouts.append(new TQRect( 1250, 1000, 6000, 4000));
+ p->layouts.append(new TQRect( 1250, 6000, 6000, 4000));
// add to the list
m_photoSizes.append(p);
@@ -1617,10 +1617,10 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->dpi = 0;
p->autoRotate = true;
// page size
- p->tqlayouts.append(new TQRect(0, 0, 8500, 11000));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect( 750, 500, 7000, 5000));
- p->tqlayouts.append(new TQRect( 750, 5750, 7000, 5000));
+ p->layouts.append(new TQRect(0, 0, 8500, 11000));
+ // photo layouts
+ p->layouts.append(new TQRect( 750, 500, 7000, 5000));
+ p->layouts.append(new TQRect( 750, 5750, 7000, 5000));
// add to the list
m_photoSizes.append(p);
@@ -1630,9 +1630,9 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->dpi = 0;
p->autoRotate = true;
// page size
- p->tqlayouts.append(new TQRect(0, 0, 8500, 11000));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect(250, 500, 8000, 10000));
+ p->layouts.append(new TQRect(0, 0, 8500, 11000));
+ // photo layouts
+ p->layouts.append(new TQRect(250, 500, 8000, 10000));
// add to the list
m_photoSizes.append(p);
@@ -1648,20 +1648,20 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->dpi = 0;
p->autoRotate = false;
// page size
- p->tqlayouts.append(new TQRect(0, 0, 8500, 11000));
- // photo tqlayouts
+ p->layouts.append(new TQRect(0, 0, 8500, 11000));
+ // photo layouts
// photo 1 is in the center, 3x4.5
- p->tqlayouts.append(new TQRect(2750, 3250, 3000, 4500));
+ p->layouts.append(new TQRect(2750, 3250, 3000, 4500));
// the remaining 1.5x2 photos begin with upper left and circle around
// top row
- p->tqlayouts.append(new TQRect(750, 750, 1500, 2000));
- p->tqlayouts.append(new TQRect(3500, 750, 1500, 2000));
- p->tqlayouts.append(new TQRect(6250, 750, 1500, 2000));
- p->tqlayouts.append(new TQRect(6250, 4500, 1500, 2000));
- p->tqlayouts.append(new TQRect(6250, 8250, 1500, 2000));
- p->tqlayouts.append(new TQRect(3500, 8250, 1500, 2000));
- p->tqlayouts.append(new TQRect(750, 8250, 1500, 2000));
- p->tqlayouts.append(new TQRect(750, 4500, 1500, 2000));
+ p->layouts.append(new TQRect(750, 750, 1500, 2000));
+ p->layouts.append(new TQRect(3500, 750, 1500, 2000));
+ p->layouts.append(new TQRect(6250, 750, 1500, 2000));
+ p->layouts.append(new TQRect(6250, 4500, 1500, 2000));
+ p->layouts.append(new TQRect(6250, 8250, 1500, 2000));
+ p->layouts.append(new TQRect(3500, 8250, 1500, 2000));
+ p->layouts.append(new TQRect(750, 8250, 1500, 2000));
+ p->layouts.append(new TQRect(750, 4500, 1500, 2000));
m_photoSizes.append(p);
// album collage 2
@@ -1670,14 +1670,14 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->dpi = 0;
p->autoRotate = false;
// page size
- p->tqlayouts.append(new TQRect(0, 0, 8500, 11000));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect(1000, 1000, 3000, 3000));
- p->tqlayouts.append(new TQRect(5000, 1000, 2500, 1250));
- p->tqlayouts.append(new TQRect(5000, 2750, 2500, 1250));
- p->tqlayouts.append(new TQRect(1000, 5000, 1500, 2000));
- p->tqlayouts.append(new TQRect(2750, 5000, 4750, 2000));
- p->tqlayouts.append(new TQRect(1000, 8000, 6500, 2000));
+ p->layouts.append(new TQRect(0, 0, 8500, 11000));
+ // photo layouts
+ p->layouts.append(new TQRect(1000, 1000, 3000, 3000));
+ p->layouts.append(new TQRect(5000, 1000, 2500, 1250));
+ p->layouts.append(new TQRect(5000, 2750, 2500, 1250));
+ p->layouts.append(new TQRect(1000, 5000, 1500, 2000));
+ p->layouts.append(new TQRect(2750, 5000, 4750, 2000));
+ p->layouts.append(new TQRect(1000, 8000, 6500, 2000));
m_photoSizes.append(p);
} // letter
break;
@@ -1694,9 +1694,9 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = true;
p->label = i18n("21 x 29.7cm");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 2100, 2970));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect( 0, 0, 2100, 2970));
+ p->layouts.append(new TQRect(0, 0, 2100, 2970));
+ // photo layouts
+ p->layouts.append(new TQRect( 0, 0, 2100, 2970));
// add to the list
m_photoSizes.append(p);
@@ -1706,16 +1706,16 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = true;
p->label = i18n("6 x 9cm (8 photos)");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 2100, 2970));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect( 100, 100, 900, 600));
- p->tqlayouts.append(new TQRect(1100, 100, 900, 600));
- p->tqlayouts.append(new TQRect( 100, 800, 900, 600));
- p->tqlayouts.append(new TQRect(1100, 800, 900, 600));
- p->tqlayouts.append(new TQRect( 100, 1500, 900, 600));
- p->tqlayouts.append(new TQRect(1100, 1500, 900, 600));
- p->tqlayouts.append(new TQRect( 100, 2200, 900, 600));
- p->tqlayouts.append(new TQRect(1100, 2200, 900, 600));
+ p->layouts.append(new TQRect(0, 0, 2100, 2970));
+ // photo layouts
+ p->layouts.append(new TQRect( 100, 100, 900, 600));
+ p->layouts.append(new TQRect(1100, 100, 900, 600));
+ p->layouts.append(new TQRect( 100, 800, 900, 600));
+ p->layouts.append(new TQRect(1100, 800, 900, 600));
+ p->layouts.append(new TQRect( 100, 1500, 900, 600));
+ p->layouts.append(new TQRect(1100, 1500, 900, 600));
+ p->layouts.append(new TQRect( 100, 2200, 900, 600));
+ p->layouts.append(new TQRect(1100, 2200, 900, 600));
// add to the list
m_photoSizes.append(p);
@@ -1725,12 +1725,12 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = true;
p->label = i18n("9 x 13cm");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 2100, 2970));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect( 100, 100, 900, 1300));
- p->tqlayouts.append(new TQRect(1100, 100, 900, 1300));
- p->tqlayouts.append(new TQRect( 100, 1500, 900, 1300));
- p->tqlayouts.append(new TQRect(1100, 1500, 900, 1300));
+ p->layouts.append(new TQRect(0, 0, 2100, 2970));
+ // photo layouts
+ p->layouts.append(new TQRect( 100, 100, 900, 1300));
+ p->layouts.append(new TQRect(1100, 100, 900, 1300));
+ p->layouts.append(new TQRect( 100, 1500, 900, 1300));
+ p->layouts.append(new TQRect(1100, 1500, 900, 1300));
// add to the list
m_photoSizes.append(p);
@@ -1740,12 +1740,12 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = true;
p->label = i18n("10 x 13.33cm");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 2100, 2970));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect( 50, 100, 1000, 1333));
- p->tqlayouts.append(new TQRect(1060, 100, 1000, 1333));
- p->tqlayouts.append(new TQRect( 50, 1500, 1000, 1333));
- p->tqlayouts.append(new TQRect(1060, 1500, 1000, 1333));
+ p->layouts.append(new TQRect(0, 0, 2100, 2970));
+ // photo layouts
+ p->layouts.append(new TQRect( 50, 100, 1000, 1333));
+ p->layouts.append(new TQRect(1060, 100, 1000, 1333));
+ p->layouts.append(new TQRect( 50, 1500, 1000, 1333));
+ p->layouts.append(new TQRect(1060, 1500, 1000, 1333));
// add to the list
m_photoSizes.append(p);
@@ -1755,11 +1755,11 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = true;
p->label = i18n("10 x 15cm");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 2100, 2970));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect( 50, 150, 1000, 1500));
- p->tqlayouts.append(new TQRect(1060, 150, 1000, 1500));
- p->tqlayouts.append(new TQRect( 300, 1750, 1500, 1000));
+ p->layouts.append(new TQRect(0, 0, 2100, 2970));
+ // photo layouts
+ p->layouts.append(new TQRect( 50, 150, 1000, 1500));
+ p->layouts.append(new TQRect(1060, 150, 1000, 1500));
+ p->layouts.append(new TQRect( 300, 1750, 1500, 1000));
// add to the list
m_photoSizes.append(p);
@@ -1769,10 +1769,10 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = true;
p->label = i18n("10 x 15cm Album");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 2100, 2970));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect( 300, 350, 1500, 1000));
- p->tqlayouts.append(new TQRect( 300, 1620, 1500, 1000));
+ p->layouts.append(new TQRect(0, 0, 2100, 2970));
+ // photo layouts
+ p->layouts.append(new TQRect( 300, 350, 1500, 1000));
+ p->layouts.append(new TQRect( 300, 1620, 1500, 1000));
// add to the list
m_photoSizes.append(p);
@@ -1782,10 +1782,10 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = true;
p->label = i18n("11.5 x 15cm Album");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 2100, 2970));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect( 300, 250, 1500, 1100));
- p->tqlayouts.append(new TQRect( 300, 1570, 1500, 1100));
+ p->layouts.append(new TQRect(0, 0, 2100, 2970));
+ // photo layouts
+ p->layouts.append(new TQRect( 300, 250, 1500, 1100));
+ p->layouts.append(new TQRect( 300, 1570, 1500, 1100));
// add to the list
m_photoSizes.append(p);
@@ -1795,10 +1795,10 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = true;
p->label = i18n("13 x 18cm");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 2100, 2970));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect( 150, 150, 1800, 1300));
- p->tqlayouts.append(new TQRect( 150, 1520, 1800, 1300));
+ p->layouts.append(new TQRect(0, 0, 2100, 2970));
+ // photo layouts
+ p->layouts.append(new TQRect( 150, 150, 1800, 1300));
+ p->layouts.append(new TQRect( 150, 1520, 1800, 1300));
// add to the list
m_photoSizes.append(p);
@@ -1808,9 +1808,9 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = true;
p->label = i18n("20 x 25cm");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 2100, 2970));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect( 50, 230, 2000, 2500));
+ p->layouts.append(new TQRect(0, 0, 2100, 2970));
+ // photo layouts
+ p->layouts.append(new TQRect( 50, 230, 2000, 2500));
// add to the list
m_photoSizes.append(p);
@@ -1833,9 +1833,9 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = true;
p->label = i18n("9 x 13cm");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 1050, 1480));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect( 50, 100, 900, 1300));
+ p->layouts.append(new TQRect(0, 0, 1050, 1480));
+ // photo layouts
+ p->layouts.append(new TQRect( 50, 100, 900, 1300));
// add to the list
m_photoSizes.append(p);
@@ -1845,9 +1845,9 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = true;
p->label = i18n("10.5 x 14.8cm");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 1050, 1480));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect(0, 0, 1050, 1480));
+ p->layouts.append(new TQRect(0, 0, 1050, 1480));
+ // photo layouts
+ p->layouts.append(new TQRect(0, 0, 1050, 1480));
// add to the list
m_photoSizes.append(p);
@@ -1870,9 +1870,9 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = true;
p->label = i18n("10 x 15cm");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 1016, 1524));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect(0, 0, 1016, 1524));
+ p->layouts.append(new TQRect(0, 0, 1016, 1524));
+ // photo layouts
+ p->layouts.append(new TQRect(0, 0, 1016, 1524));
// add to the list
m_photoSizes.append(p);
@@ -1882,9 +1882,9 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = true;
p->label = i18n("9 x 13cm");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 1016, 1524));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect( 50, 100, 900, 1300));
+ p->layouts.append(new TQRect(0, 0, 1016, 1524));
+ // photo layouts
+ p->layouts.append(new TQRect( 50, 100, 900, 1300));
// add to the list
m_photoSizes.append(p);
@@ -1909,9 +1909,9 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = true;
p->label = i18n("13 x 18cm");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 1270, 1778));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect(0, 0, 1270, 1778));
+ p->layouts.append(new TQRect(0, 0, 1270, 1778));
+ // photo layouts
+ p->layouts.append(new TQRect(0, 0, 1270, 1778));
// add to the list
m_photoSizes.append(p);
@@ -1921,9 +1921,9 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = true;
p->label = i18n("10 x 15cm");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 1270, 1778));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect(0, 0, 1016, 1524));
+ p->layouts.append(new TQRect(0, 0, 1270, 1778));
+ // photo layouts
+ p->layouts.append(new TQRect(0, 0, 1016, 1524));
// add to the list
m_photoSizes.append(p);
@@ -1933,9 +1933,9 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = true;
p->label = i18n("9 x 13cm");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 1270, 1778));
- // photo tqlayouts
- p->tqlayouts.append(new TQRect( 50, 100, 900, 1300));
+ p->layouts.append(new TQRect(0, 0, 1270, 1778));
+ // photo layouts
+ p->layouts.append(new TQRect( 50, 100, 900, 1300));
// add to the list
m_photoSizes.append(p);
@@ -1950,7 +1950,7 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
default:
{
- kdDebug( 51000 ) << "Initializing Unsupported page tqlayouts\n";
+ kdDebug( 51000 ) << "Initializing Unsupported page layouts\n";
// We don't support this page size yet. Just create a default page.
TPhotoSize *p;
p = new TPhotoSize;
@@ -1958,8 +1958,8 @@ void FrmPrintWizard::initPhotoSizes(PageSize pageSize)
p->autoRotate = false;
p->label = i18n("Unsupported Paper Size");
// page size
- p->tqlayouts.append(new TQRect(0, 0, 8500, 11000));
- p->tqlayouts.append(new TQRect(0, 0, 8500, 11000));
+ p->layouts.append(new TQRect(0, 0, 8500, 11000));
+ p->layouts.append(new TQRect(0, 0, 8500, 11000));
// add to the list
m_photoSizes.append(p);
}
diff --git a/kipi-plugins/printwizard/frmprintwizard.h b/kipi-plugins/printwizard/frmprintwizard.h
index 1234317..42f8692 100644
--- a/kipi-plugins/printwizard/frmprintwizard.h
+++ b/kipi-plugins/printwizard/frmprintwizard.h
@@ -44,7 +44,7 @@ typedef struct _TPhotoSize {
TQString label;
int dpi;
bool autoRotate;
- TQPtrList<TQRect> tqlayouts; // first element is page size
+ TQPtrList<TQRect> layouts; // first element is page size
} TPhotoSize;
class FrmPrintWizard : public FrmPrintWizardBase
@@ -92,8 +92,8 @@ private:
void removeGimpFiles();
void initPhotoSizes(PageSize pageSize);
void previewPhotos();
- void printPhotos(TQPtrList<TPhoto> photos, TQPtrList<TQRect> tqlayouts, KPrinter &printer);
- TQStringList printPhotosToFile(TQPtrList<TPhoto> photos, TQString &baseFilename, TPhotoSize *tqlayouts);
+ void printPhotos(TQPtrList<TPhoto> photos, TQPtrList<TQRect> layouts, KPrinter &printer);
+ TQStringList printPhotosToFile(TQPtrList<TPhoto> photos, TQString &baseFilename, TPhotoSize *layouts);
void loadSettings();
void saveSettings();
@@ -102,10 +102,10 @@ private:
TQString captionFormatter(TPhoto *photo, const TQString& format);
void printCaption(TQPainter &p, TPhoto*photo, int captionW, int captionH, TQString caption);
- bool paintOnePage(TQPainter &p, TQPtrList<TPhoto> photos, TQPtrList<TQRect> tqlayouts,
+ bool paintOnePage(TQPainter &p, TQPtrList<TPhoto> photos, TQPtrList<TQRect> layouts,
int captionType, unsigned int &current, bool useThumbnails = false);
- bool paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrList<TQRect> tqlayouts,
+ bool paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrList<TQRect> layouts,
int captionType, unsigned int &current);
void manageBtnPrintOrder();
diff --git a/kipi-plugins/printwizard/frmprintwizardbase.ui b/kipi-plugins/printwizard/frmprintwizardbase.ui
index bff2e25..55ebac8 100644
--- a/kipi-plugins/printwizard/frmprintwizardbase.ui
+++ b/kipi-plugins/printwizard/frmprintwizardbase.ui
@@ -2312,7 +2312,7 @@ Click the 'Next' button to begin.</string>
<slot>ListPrintOrder_selected( TQListBoxItem * )</slot>
<slot>ListPhotoOrder_highlighted( int )</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>kcombobox.h</includehint>
diff --git a/kipi-plugins/slideshow/imageloadthread.cpp b/kipi-plugins/slideshow/imageloadthread.cpp
index 12d5473..e833132 100644
--- a/kipi-plugins/slideshow/imageloadthread.cpp
+++ b/kipi-plugins/slideshow/imageloadthread.cpp
@@ -106,7 +106,7 @@ void ImageLoadThread::run() {
do {
ok = loadImage();
if ( !ok)
- tqinvalidateCurrentImageName();
+ invalidateCurrentImageName();
} while ( !ok && m_fileIndex < (int)m_fileList.count());
if ( m_fileIndex == (int)m_fileList.count() )
@@ -172,7 +172,7 @@ bool ImageLoadThread::loadImage() {
return true;
}
-void ImageLoadThread::tqinvalidateCurrentImageName() {
+void ImageLoadThread::invalidateCurrentImageName() {
m_fileList.remove(m_fileList[m_fileIndex]);
m_fileIndex++;
}
diff --git a/kipi-plugins/slideshow/imageloadthread.h b/kipi-plugins/slideshow/imageloadthread.h
index b1bfe1d..ae53687 100644
--- a/kipi-plugins/slideshow/imageloadthread.h
+++ b/kipi-plugins/slideshow/imageloadthread.h
@@ -67,7 +67,7 @@ protected:
void run();
bool loadImage();
- void tqinvalidateCurrentImageName();
+ void invalidateCurrentImageName();
private:
diff --git a/kipi-plugins/slideshow/slideshowconfigbase.ui b/kipi-plugins/slideshow/slideshowconfigbase.ui
index 0b6fa9b..7231a60 100644
--- a/kipi-plugins/slideshow/slideshowconfigbase.ui
+++ b/kipi-plugins/slideshow/slideshowconfigbase.ui
@@ -1511,7 +1511,7 @@ Ken Burns effect doesn't use this cache mechanism.</string>
<function access="protected">readSettings()</function>
<function access="protected">saveSettings()</function>
</functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kdialog.h</includehint>
<includehint>listimageitems.h</includehint>
diff --git a/kipi-plugins/sync/galleryalbumdialog.ui b/kipi-plugins/sync/galleryalbumdialog.ui
index e925fa5..26ee8d9 100644
--- a/kipi-plugins/sync/galleryalbumdialog.ui
+++ b/kipi-plugins/sync/galleryalbumdialog.ui
@@ -193,5 +193,5 @@
<slot>reject()</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kipi-plugins/sync/galleryitem.h b/kipi-plugins/sync/galleryitem.h
index a752698..9a1c839 100644
--- a/kipi-plugins/sync/galleryitem.h
+++ b/kipi-plugins/sync/galleryitem.h
@@ -51,7 +51,7 @@ public:
GAlbum()
{
ref_num = -1;
- tqparent_ref_num = -1;
+ parent_ref_num = -1;
add = false;
write = false;
@@ -62,16 +62,16 @@ public:
bool operator<(const GAlbum& rhs) const
{
- if (tqparent_ref_num == rhs.tqparent_ref_num)
+ if (parent_ref_num == rhs.parent_ref_num)
return ref_num < rhs.ref_num;
- return tqparent_ref_num < rhs.tqparent_ref_num;
+ return parent_ref_num < rhs.parent_ref_num;
}
int ref_num;
- int tqparent_ref_num;
+ int parent_ref_num;
TQString name;
- TQString tqparentName;
+ TQString parentName;
TQString title;
TQString summary;
TQString baseurl;
diff --git a/kipi-plugins/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp
index 96121be..958ad6f 100644
--- a/kipi-plugins/sync/gallerywindow.cpp
+++ b/kipi-plugins/sync/gallerywindow.cpp
@@ -276,7 +276,7 @@ void GalleryWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
{
const GAlbum& album = *iter;
- if ( album.tqparent_ref_num == 0 )
+ if ( album.parent_ref_num == 0 )
{
GAlbumViewItem* item = new GAlbumViewItem( m_albumView, album.title,
album );
@@ -285,7 +285,7 @@ void GalleryWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
}
else
{
- TQListViewItem* tqparent = m_albumDict.tqfind( album.tqparent_ref_num );
+ TQListViewItem* tqparent = m_albumDict.tqfind( album.parent_ref_num );
if ( tqparent )
{
GAlbumViewItem* item = new GAlbumViewItem( tqparent, album.title,
@@ -518,20 +518,20 @@ void GalleryWindow::slotNewAlbum()
return;
}
- TQString tqparentAlbumName;
+ TQString parentAlbumName;
TQListViewItem* item = m_albumView->selectedItem();
if (item)
{
GAlbumViewItem* viewItem = static_cast<GAlbumViewItem*>(item);
- tqparentAlbumName = viewItem->album.name;
+ parentAlbumName = viewItem->album.name;
}
else
{
- tqparentAlbumName = "0";
+ parentAlbumName = "0";
}
- m_talker->createAlbum(tqparentAlbumName, name, title, caption);
+ m_talker->createAlbum(parentAlbumName, name, title, caption);
}
void GalleryWindow::slotAddPhotos()
diff --git a/kipi-plugins/sync/sinklistbase.ui b/kipi-plugins/sync/sinklistbase.ui
index a73783f..7cfe2c0 100644
--- a/kipi-plugins/sync/sinklistbase.ui
+++ b/kipi-plugins/sync/sinklistbase.ui
@@ -58,7 +58,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayoutButtons</cstring>
+ <cstring>layoutButtons</cstring>
</property>
<property name="geometry">
<rect>
@@ -172,7 +172,7 @@
<slot access="protected">buttonConfigure_clicked()</slot>
<slot access="protected">buttonAdd_clicked()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kdialog.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp
index d19c73e..9e60716 100644
--- a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp
+++ b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp
@@ -166,7 +166,7 @@ void GallerySink::listPhotos( const TQString& albumName )
emit signalBusy( true );
}
-void GallerySink::createAlbum( const TQString& tqparentAlbumName,
+void GallerySink::createAlbum( const TQString& parentAlbumName,
const TQString& albumName,
const TQString& albumTitle,
const TQString& albumCaption )
@@ -181,7 +181,7 @@ void GallerySink::createAlbum( const TQString& tqparentAlbumName,
form.addPair("cmd", "new-album");
form.addPair("protocol_version", "2.3");
- form.addPair("set_albumName", tqparentAlbumName);
+ form.addPair("set_albumName", parentAlbumName);
if (!albumName.isEmpty())
form.addPair("newAlbumName", albumName);
if (!albumTitle.isEmpty())
@@ -441,7 +441,7 @@ void GallerySink::parseResponseListAlbums(const TQByteArray &data)
else if (key.startsWith("album.tqparent"))
{
if (iter != albumList.end())
- (*iter).tqparent_ref_num = value.toInt();
+ (*iter).parent_ref_num = value.toInt();
}
else if (key.startsWith("album.perms.add"))
{
diff --git a/kipi-plugins/sync/sinks/gallery/gallerysink.h b/kipi-plugins/sync/sinks/gallery/gallerysink.h
index 27d5b48..3b5cef4 100644
--- a/kipi-plugins/sync/sinks/gallery/gallerysink.h
+++ b/kipi-plugins/sync/sinks/gallery/gallerysink.h
@@ -67,7 +67,7 @@ public:
const TQString& passwd );
void listAlbums();
void listPhotos( const TQString& albumName );
- void createAlbum( const TQString& tqparentAlbumName,
+ void createAlbum( const TQString& parentAlbumName,
const TQString& albumName,
const TQString& albumTitle,
const TQString& albumCaption );