5 files changed, 16 insertions, 16 deletions

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()