diff options
Diffstat (limited to 'kipi-plugins/sync')
-rw-r--r-- | kipi-plugins/sync/galleryviewitem.h | 8 | ||||
-rw-r--r-- | kipi-plugins/sync/gallerywidget.cpp | 4 | ||||
-rw-r--r-- | kipi-plugins/sync/gallerywidget.h | 2 | ||||
-rw-r--r-- | kipi-plugins/sync/gallerywindow.cpp | 12 | ||||
-rw-r--r-- | kipi-plugins/sync/gallerywindow.h | 2 | ||||
-rw-r--r-- | kipi-plugins/sync/libkipi2/collection.h | 2 | ||||
-rw-r--r-- | kipi-plugins/sync/plugin_sync.cpp | 14 | ||||
-rw-r--r-- | kipi-plugins/sync/sinks/gallery/gallerysink.cpp | 4 |
8 files changed, 24 insertions, 24 deletions
diff --git a/kipi-plugins/sync/galleryviewitem.h b/kipi-plugins/sync/galleryviewitem.h index 6a40c69..bb8295d 100644 --- a/kipi-plugins/sync/galleryviewitem.h +++ b/kipi-plugins/sync/galleryviewitem.h @@ -30,12 +30,12 @@ class GAlbumViewItem : public TQListViewItem { public: - GAlbumViewItem(TQListView* tqparent, const TQString& name, + GAlbumViewItem(TQListView* parent, const TQString& name, const GAlbum& _album) - : TQListViewItem(tqparent, name), album(_album) {} - GAlbumViewItem(TQListViewItem* tqparent, const TQString& name, + : TQListViewItem(parent, name), album(_album) {} + GAlbumViewItem(TQListViewItem* parent, const TQString& name, const GAlbum& _album) - : TQListViewItem(tqparent, name), album(_album) {} + : TQListViewItem(parent, name), album(_album) {} GAlbum album; diff --git a/kipi-plugins/sync/gallerywidget.cpp b/kipi-plugins/sync/gallerywidget.cpp index 97e6818..d9472da 100644 --- a/kipi-plugins/sync/gallerywidget.cpp +++ b/kipi-plugins/sync/gallerywidget.cpp @@ -42,8 +42,8 @@ namespace KIPIGalleryExportPlugin { -GalleryWidget::GalleryWidget( TQWidget* tqparent, const char* name, WFlags fl ) - : TQWidget( tqparent, name, fl ) +GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "GalleryWidget" ); diff --git a/kipi-plugins/sync/gallerywidget.h b/kipi-plugins/sync/gallerywidget.h index 4f1f081..3ed8111 100644 --- a/kipi-plugins/sync/gallerywidget.h +++ b/kipi-plugins/sync/gallerywidget.h @@ -37,7 +37,7 @@ class GalleryWidget : public TQWidget public: - GalleryWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + GalleryWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~GalleryWidget(); private slots: diff --git a/kipi-plugins/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp index ebaf53e..336e6d4 100644 --- a/kipi-plugins/sync/gallerywindow.cpp +++ b/kipi-plugins/sync/gallerywindow.cpp @@ -68,8 +68,8 @@ namespace KIPIGalleryExportPlugin { -GalleryWindow::GalleryWindow(KIPI::Interface* interface, TQWidget *tqparent, Galleries* pGalleries) - : KDialogBase(tqparent, 0, true, i18n("Gallery Export"), Help|Close, Close, false), +GalleryWindow::GalleryWindow(KIPI::Interface* interface, TQWidget *parent, Galleries* pGalleries) + : KDialogBase(parent, 0, true, i18n("Gallery Export"), Help|Close, Close, false), m_interface(interface), mpGalleries(pGalleries) { @@ -285,17 +285,17 @@ void GalleryWindow::slotAlbums( const TQValueList<GAlbum>& albumList ) } else { - TQListViewItem* tqparent = m_albumDict.find( album.parent_ref_num ); - if ( tqparent ) + TQListViewItem* parent = m_albumDict.find( album.parent_ref_num ); + if ( parent ) { - GAlbumViewItem* item = new GAlbumViewItem( tqparent, album.title, + GAlbumViewItem* item = new GAlbumViewItem( parent, album.title, album); item->setPixmap( 0, pix ); m_albumDict.insert( album.ref_num, item ); } else { - kdWarning() << "Failed to find tqparent for album " + kdWarning() << "Failed to find parent for album " << album.name << " with id " << album.ref_num << "\n"; } diff --git a/kipi-plugins/sync/gallerywindow.h b/kipi-plugins/sync/gallerywindow.h index bf8d378..87c7d52 100644 --- a/kipi-plugins/sync/gallerywindow.h +++ b/kipi-plugins/sync/gallerywindow.h @@ -57,7 +57,7 @@ class GalleryWindow : public KDialogBase public: - GalleryWindow(KIPI::Interface *interface, TQWidget *tqparent, Galleries* pGalleries); + GalleryWindow(KIPI::Interface *interface, TQWidget *parent, Galleries* pGalleries); ~GalleryWindow(); private: diff --git a/kipi-plugins/sync/libkipi2/collection.h b/kipi-plugins/sync/libkipi2/collection.h index 931fa7c..8ebd4d0 100644 --- a/kipi-plugins/sync/libkipi2/collection.h +++ b/kipi-plugins/sync/libkipi2/collection.h @@ -68,7 +68,7 @@ namespace KIPI2 virtual const Item* addItem() = 0; private: - // Store for tqparent + // Store for parent Collection* mpParent; // Store the features that this collection supports diff --git a/kipi-plugins/sync/plugin_sync.cpp b/kipi-plugins/sync/plugin_sync.cpp index 69a0c06..cf28e1e 100644 --- a/kipi-plugins/sync/plugin_sync.cpp +++ b/kipi-plugins/sync/plugin_sync.cpp @@ -44,10 +44,10 @@ K_EXPORT_COMPONENT_FACTORY(kipiplugin_sync, Factory("kipiplugin_sync")) -Plugin_Sync::Plugin_Sync(TQObject *tqparent, +Plugin_Sync::Plugin_Sync(TQObject *parent, const char*, const TQStringList&) - : KIPI::Plugin(Factory::instance(), tqparent, "Sync"), + : KIPI::Plugin(Factory::instance(), parent, "Sync"), mpSinks(NULL) { kdDebug(51001) << "Plugin_Sync plugin loaded" @@ -63,7 +63,7 @@ void Plugin_Sync::setup(TQWidget* widget) // Standard initialisation for Kipi Plugins KIPI::Plugin::setup(widget); - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { @@ -122,7 +122,7 @@ Plugin_Sync::~Plugin_Sync() void Plugin_Sync::slotSync() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { kdError( 51000 ) << "Kipi interface is null!" << endl; @@ -137,7 +137,7 @@ void Plugin_Sync::slotSync() void Plugin_Sync::slotConfigure() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { kdError(51000) << "Kipi interface is null!" << endl; @@ -152,7 +152,7 @@ void Plugin_Sync::slotConfigure() void Plugin_Sync::slotSettingsCollection() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { kdError(51000) << "Kipi interface is null!" << endl; @@ -165,7 +165,7 @@ void Plugin_Sync::slotSettingsCollection() void Plugin_Sync::slotSettingsImage() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(tqparent()); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent()); if (!interface) { kdError(51000) << "Kipi interface is null!" << endl; diff --git a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp index acfae60..3035e27 100644 --- a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp +++ b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp @@ -438,7 +438,7 @@ void GallerySink::parseResponseListAlbums(const TQByteArray &data) if (iter != albumList.end()) (*iter).summary = value; } - else if (key.startsWith("album.tqparent")) + else if (key.startsWith("album.parent")) { if (iter != albumList.end()) (*iter).parent_ref_num = value.toInt(); @@ -484,7 +484,7 @@ void GallerySink::parseResponseListAlbums(const TQByteArray &data) return; } - // We need tqparent albums to come first for rest of the code to work + // We need parent albums to come first for rest of the code to work qHeapSort(albumList); emit signalAlbums( albumList ); |