summaryrefslogtreecommitdiffstats
path: root/libkipi/libkipi
diff options
context:
space:
mode:
Diffstat (limited to 'libkipi/libkipi')
-rw-r--r--libkipi/libkipi/KDStream.cpp4
-rw-r--r--libkipi/libkipi/KDStream.h2
-rw-r--r--libkipi/libkipi/batchprogressdialog.h2
-rw-r--r--libkipi/libkipi/design6
-rw-r--r--libkipi/libkipi/imagecollectionselector.cpp24
-rw-r--r--libkipi/libkipi/imagecollectionselector.h2
-rw-r--r--libkipi/libkipi/imagedialog.cpp24
-rw-r--r--libkipi/libkipi/imagedialog.h2
-rw-r--r--libkipi/libkipi/interface.h2
-rw-r--r--libkipi/libkipi/libkipi_export.h.cmake4
-rw-r--r--libkipi/libkipi/plugin.cpp2
-rw-r--r--libkipi/libkipi/pluginloader.h4
-rw-r--r--libkipi/libkipi/uploadwidget.cpp16
-rw-r--r--libkipi/libkipi/uploadwidget.h2
14 files changed, 47 insertions, 49 deletions
diff --git a/libkipi/libkipi/KDStream.cpp b/libkipi/libkipi/KDStream.cpp
index 6e088bf..790ee78 100644
--- a/libkipi/libkipi/KDStream.cpp
+++ b/libkipi/libkipi/KDStream.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
KD Tools - a set of useful widgets for TQt
$Id: KDStream.cpp 445690 2005-08-11 17:01:49Z toma $
*/
@@ -717,7 +717,6 @@ TQValueListConstIterator
TQValueListIterator
TQPtrListIterator// TQt 3
TQPtrCollection// TQt 3
-TQSortedList - Depricated // TQt 2
*/
@@ -938,7 +937,6 @@ TQScreenCursor // TQt 2
TQScrollBar
TQScrollView
TQSemaphore
-TQSemiModal // TQt 2
TQServerSocket
TQSessionManager
TQSettings// TQt 3
diff --git a/libkipi/libkipi/KDStream.h b/libkipi/libkipi/KDStream.h
index be909dd..046f8c9 100644
--- a/libkipi/libkipi/KDStream.h
+++ b/libkipi/libkipi/KDStream.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
KD Tools - a set of useful widgets for TQt
$Id: KDStream.h 387954 2005-02-10 07:49:40Z blackie $
*/
diff --git a/libkipi/libkipi/batchprogressdialog.h b/libkipi/libkipi/batchprogressdialog.h
index 00be6ff..86f489c 100644
--- a/libkipi/libkipi/batchprogressdialog.h
+++ b/libkipi/libkipi/batchprogressdialog.h
@@ -52,7 +52,7 @@ enum ActionMessageType
class LIBKIPI_EXPORT BatchProgressDialog : public KDialogBase
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/libkipi/libkipi/design b/libkipi/libkipi/design
index 350b735..fa494f0 100644
--- a/libkipi/libkipi/design
+++ b/libkipi/libkipi/design
@@ -59,19 +59,19 @@ The implementation would looks something like this:
class Browser {
public:
Browser( BrowserShared* );
- virtual QWidget* widget( QWidget* parent );
+ virtual TQWidget* widget( TQWidget* parent );
KURL::List images();
// all the other stuff to make a shared class.
signals:
- void descriptionChanged( const QString& );
+ void descriptionChanged( const TQString& );
void previewChanged( const QPixmap& );
}
class BrowserShared {
public:
- virtual QWidget* widget( QWidget* parent ) = 0;
+ virtual TQWidget* widget( TQWidget* parent ) = 0;
KURL::List images() = 0;
signals:
...
diff --git a/libkipi/libkipi/imagecollectionselector.cpp b/libkipi/libkipi/imagecollectionselector.cpp
index 9a58fa3..1f27a20 100644
--- a/libkipi/libkipi/imagecollectionselector.cpp
+++ b/libkipi/libkipi/imagecollectionselector.cpp
@@ -95,27 +95,27 @@ ImageCollectionSelector::ImageCollectionSelector(TQWidget* parent, Interface* in
d->_list->addColumn("");
d->_list->header()->hide();
- connect(d->_list, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
+ connect(d->_list, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
TQHBoxLayout* mainLayout=new TQHBoxLayout(this, 0, KDialog::spacingHint());
mainLayout->addWidget(d->_list);
TQVBoxLayout* rightLayout = new TQVBoxLayout(mainLayout, 0);
- KButtonBox* box=new KButtonBox(this,Qt::Vertical);
+ KButtonBox* box=new KButtonBox(this,TQt::Vertical);
rightLayout->addWidget(box);
TQPushButton* selectAll=box->addButton(i18n("Select All"));
TQPushButton* invertSelection=box->addButton(i18n("Invert Selection"));
TQPushButton* selectNone=box->addButton(i18n("Select None"));
box->layout();
- connect(selectAll, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotSelectAll()) );
- connect(invertSelection, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotInvertSelection()) );
- connect(selectNone, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotSelectNone()) );
+ connect(selectAll, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotSelectAll()) );
+ connect(invertSelection, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotInvertSelection()) );
+ connect(selectNone, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotSelectNone()) );
rightLayout->addItem(new TQSpacerItem(10,20,TQSizePolicy::Fixed,
TQSizePolicy::Expanding));
@@ -138,7 +138,7 @@ ImageCollectionSelector::ImageCollectionSelector(TQWidget* parent, Interface* in
d->_textLabel = new TQLabel(rightBox);
fillList();
- TQTimer::singleShot(0, this, TQT_SLOT(slotInitialShow()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotInitialShow()));
}
@@ -266,8 +266,8 @@ void ImageCollectionSelector::slotSelectionChanged(TQListViewItem* listItem)
if (!images.isEmpty())
{
TDEIO::PreviewJob* thumbJob = TDEIO::filePreview(images.first(), 128);
- connect( thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
- TQT_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
+ connect( thumbJob, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
+ TQ_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
}
}
diff --git a/libkipi/libkipi/imagecollectionselector.h b/libkipi/libkipi/imagecollectionselector.h
index 2de463b..d6a68a3 100644
--- a/libkipi/libkipi/imagecollectionselector.h
+++ b/libkipi/libkipi/imagecollectionselector.h
@@ -44,7 +44,7 @@ class Interface;
class LIBKIPI_EXPORT ImageCollectionSelector : public TQWidget
{
-Q_OBJECT
+TQ_OBJECT
class Private;
diff --git a/libkipi/libkipi/imagedialog.cpp b/libkipi/libkipi/imagedialog.cpp
index 1fb25a6..fd7c63a 100644
--- a/libkipi/libkipi/imagedialog.cpp
+++ b/libkipi/libkipi/imagedialog.cpp
@@ -136,7 +136,7 @@ ImageDialog::ImageDialog(TQWidget* parent, KIPI::Interface* interface,
TQPushButton *helpButton = actionButton( Help );
KHelpMenu* helpMenu = new KHelpMenu(this, about, false);
helpMenu->menu()->removeItemAt(0);
- helpMenu->menu()->insertItem(i18n("Kipi Plugins Handbooks"), this, TQT_SLOT(slotHelp()), 0, -1, 0);
+ helpMenu->menu()->insertItem(i18n("Kipi Plugins Handbooks"), this, TQ_SLOT(slotHelp()), 0, -1, 0);
helpButton->setPopup( helpMenu->menu() );
//---------------------------------------------
@@ -168,17 +168,17 @@ ImageDialog::ImageDialog(TQWidget* parent, KIPI::Interface* interface,
for(; it!=d->_albums.end(); ++it) {
new AlbumLVI(d->_albumList, *it);
}
- TQTimer::singleShot(0, this, TQT_SLOT(slotInitialShow()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotInitialShow()));
- connect(d->_albumList, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- this, TQT_SLOT(fillImageList(TQListViewItem*)) );
+ connect(d->_albumList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ this, TQ_SLOT(fillImageList(TQListViewItem*)) );
if (singleSelection)
- connect(d->_imageList, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- this, TQT_SLOT(slotImageSelected(TQListViewItem*)) );
+ connect(d->_imageList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ this, TQ_SLOT(slotImageSelected(TQListViewItem*)) );
else
- connect(d->_imageList, TQT_SIGNAL(selectionChanged()),
- this, TQT_SLOT(slotImagesSelected()));
+ connect(d->_imageList, TQ_SIGNAL(selectionChanged()),
+ this, TQ_SLOT(slotImagesSelected()));
enableButtonOK(false);
}
@@ -246,8 +246,8 @@ void ImageDialog::slotImageSelected(TQListViewItem* item) {
d->_preview->clear();
TDEIO::PreviewJob* thumbJob = TDEIO::filePreview(d->_url, PREVIEW_SIZE);
- connect( thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
- TQT_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
+ connect( thumbJob, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
+ TQ_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
}
void ImageDialog::slotImagesSelected()
@@ -284,8 +284,8 @@ void ImageDialog::slotImagesSelected()
d->_url = d->_urls.first();
TDEIO::PreviewJob* thumbJob = TDEIO::filePreview(d->_url, PREVIEW_SIZE);
- connect( thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
- TQT_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
+ connect( thumbJob, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
+ TQ_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
}
else
{
diff --git a/libkipi/libkipi/imagedialog.h b/libkipi/libkipi/imagedialog.h
index 9e9244d..8122051 100644
--- a/libkipi/libkipi/imagedialog.h
+++ b/libkipi/libkipi/imagedialog.h
@@ -50,7 +50,7 @@ namespace KIPI
class LIBKIPI_EXPORT ImageDialog : public KDialogBase
{
-Q_OBJECT
+TQ_OBJECT
class Private;
diff --git a/libkipi/libkipi/interface.h b/libkipi/libkipi/interface.h
index b9cf30a..f954c60 100644
--- a/libkipi/libkipi/interface.h
+++ b/libkipi/libkipi/interface.h
@@ -58,7 +58,7 @@ namespace KIPI
/** class Interface */
class LIBKIPI_EXPORT Interface : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libkipi/libkipi/libkipi_export.h.cmake b/libkipi/libkipi/libkipi_export.h.cmake
index 20e1553..8870334 100644
--- a/libkipi/libkipi/libkipi_export.h.cmake
+++ b/libkipi/libkipi/libkipi_export.h.cmake
@@ -27,8 +27,8 @@
#include <kdemacros.h>
#endif
-#ifdef KDE_EXPORT
-#define LIBKIPI_EXPORT KDE_EXPORT
+#ifdef TDE_EXPORT
+#define LIBKIPI_EXPORT TDE_EXPORT
#else
#define LIBKIPI_EXPORT
#endif
diff --git a/libkipi/libkipi/plugin.cpp b/libkipi/libkipi/plugin.cpp
index b96057d..b7af300 100644
--- a/libkipi/libkipi/plugin.cpp
+++ b/libkipi/libkipi/plugin.cpp
@@ -84,7 +84,7 @@ void KIPI::Plugin::setup( TQWidget* widget )
d->m_defaultWidget = widget;
d->m_actions.insert( widget, TDEActionPtrList() );
TQString name = TQString( "action collection for %1" ).arg( widget->name() );
- d->m_actionCollection.insert( widget, new TDEActionCollection( widget, TQT_TQOBJECT(widget), name.latin1(), d->m_instance ) );
+ d->m_actionCollection.insert( widget, new TDEActionCollection( widget, widget, name.latin1(), d->m_instance ) );
}
diff --git a/libkipi/libkipi/pluginloader.h b/libkipi/libkipi/pluginloader.h
index 8671d31..cf248ab 100644
--- a/libkipi/libkipi/pluginloader.h
+++ b/libkipi/libkipi/pluginloader.h
@@ -36,7 +36,7 @@ namespace KIPI
class LIBKIPI_EXPORT PluginLoader :public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
class LIBKIPI_EXPORT Info
@@ -88,7 +88,7 @@ namespace KIPI
class LIBKIPI_EXPORT ConfigWidget :public TQScrollView
{
- Q_OBJECT
+ TQ_OBJECT
public:
ConfigWidget( TQWidget* parent );
diff --git a/libkipi/libkipi/uploadwidget.cpp b/libkipi/libkipi/uploadwidget.cpp
index 93f49ec..43106f0 100644
--- a/libkipi/libkipi/uploadwidget.cpp
+++ b/libkipi/libkipi/uploadwidget.cpp
@@ -105,14 +105,14 @@ KIPI::UploadWidget::UploadWidget( KIPI::Interface* interface, TQWidget* parent,
d->m_pendingPath = TQStringList::split( "/", uploadPath, false );
- connect( d->m_branch, TQT_SIGNAL( populateFinished(KFileTreeViewItem *) ),
- this, TQT_SLOT( slotPopulateFinished(KFileTreeViewItem *) ) );
+ connect( d->m_branch, TQ_SIGNAL( populateFinished(KFileTreeViewItem *) ),
+ this, TQ_SLOT( slotPopulateFinished(KFileTreeViewItem *) ) );
d->m_branch->setOpen(true);
}
- connect( d->m_treeView, TQT_SIGNAL( executed(TQListViewItem *) ),
- this, TQT_SLOT( slotFolderSelected(TQListViewItem *) ) );
+ connect( d->m_treeView, TQ_SIGNAL( executed(TQListViewItem *) ),
+ this, TQ_SLOT( slotFolderSelected(TQListViewItem *) ) );
}
KIPI::UploadWidget::~UploadWidget()
@@ -134,8 +134,8 @@ void KIPI::UploadWidget::slotPopulateFinished( KFileTreeViewItem * parentItem )
{
if ( d->m_pendingPath.isEmpty() )
{
- disconnect( d->m_branch, TQT_SIGNAL( populateFinished(KFileTreeViewItem *) ),
- this, TQT_SLOT( slotPopulateFinished(KFileTreeViewItem *) ) );
+ disconnect( d->m_branch, TQ_SIGNAL( populateFinished(KFileTreeViewItem *) ),
+ this, TQ_SLOT( slotPopulateFinished(KFileTreeViewItem *) ) );
return;
}
@@ -189,8 +189,8 @@ void KIPI::UploadWidget::mkdir()
TDEIO::SimpleJob* job = TDEIO::mkdir(url);
- connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
- this, TQT_SLOT(slotAlbumCreated(TDEIO::Job*)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job*)),
+ this, TQ_SLOT(slotAlbumCreated(TDEIO::Job*)));
}
void KIPI::UploadWidget::slotAlbumCreated(TDEIO::Job* job)
diff --git a/libkipi/libkipi/uploadwidget.h b/libkipi/libkipi/uploadwidget.h
index 32ac758..2ace488 100644
--- a/libkipi/libkipi/uploadwidget.h
+++ b/libkipi/libkipi/uploadwidget.h
@@ -44,7 +44,7 @@ namespace KIPI
{
class LIBKIPI_EXPORT UploadWidget :public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public: