diff options
Diffstat (limited to 'keduca/libkeduca')
-rw-r--r-- | keduca/libkeduca/Makefile.am | 2 | ||||
-rw-r--r-- | keduca/libkeduca/fileread.cpp | 10 | ||||
-rw-r--r-- | keduca/libkeduca/fileread.h | 2 | ||||
-rw-r--r-- | keduca/libkeduca/kgallerydialog.h | 2 | ||||
-rw-r--r-- | keduca/libkeduca/kgallerydialogbase.ui | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/keduca/libkeduca/Makefile.am b/keduca/libkeduca/Makefile.am index 1e1cf9c6..b7eeb7eb 100644 --- a/keduca/libkeduca/Makefile.am +++ b/keduca/libkeduca/Makefile.am @@ -2,7 +2,7 @@ INCLUDES=$(all_includes) noinst_LTLIBRARIES = libkeduca.la libkeduca_la_SOURCES = kgallerydialogbase.ui fileread.cpp kgallerydialog.cpp -libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libkeduca_la_LIBADD = -ltdeprint noinst_HEADERS = fileread.h kgallerydialog.h kgallerydialogbase.h diff --git a/keduca/libkeduca/fileread.cpp b/keduca/libkeduca/fileread.cpp index 8ba07b50..0a174790 100644 --- a/keduca/libkeduca/fileread.cpp +++ b/keduca/libkeduca/fileread.cpp @@ -20,7 +20,7 @@ #include <assert.h> #include <tdeio/netaccess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kmimetype.h> #include <kdebug.h> #include <tdetempfile.h> @@ -670,7 +670,7 @@ bool FileRead::saveFile( const KURL &url, bool copyimages, bool saveCompressed ) if( saveFile(_tmpfile->name(), copyimages, saveCompressed) ) { // upload the file TDEIO::Job * job = TDEIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotUploadFinished (TDEIO::Job *) ) ); return true; } } @@ -689,7 +689,7 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom TQFile file(filename); TQStringList copyJOB; - stream.setDevice(TQT_TQIODEVICE(&buffer)); + stream.setDevice(&buffer); if ( (!file.open(IO_WriteOnly)) || (!buffer.open(IO_WriteOnly)) ) { @@ -847,7 +847,7 @@ bool FileRead::saveResults( const KURL &url, const TQString &results ) if( saveResults(_tmpfile->name(), results) ) { // upload the file TDEIO::Job * job = TDEIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotUploadFinished (TDEIO::Job *) ) ); return true; } } @@ -862,7 +862,7 @@ bool FileRead::saveResults( const TQString &filename, const TQString &results ) TQFile file(filename); TQStringList copyJOB; - stream.setDevice(TQT_TQIODEVICE(&file)); + stream.setDevice(&file); if(!file.open(IO_WriteOnly)) { diff --git a/keduca/libkeduca/fileread.h b/keduca/libkeduca/fileread.h index 9a34c1a8..ed9d54a2 100644 --- a/keduca/libkeduca/fileread.h +++ b/keduca/libkeduca/fileread.h @@ -33,7 +33,7 @@ class TQFile; */ class FileRead : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/libkeduca/kgallerydialog.h b/keduca/libkeduca/kgallerydialog.h index 9be42034..1712a61c 100644 --- a/keduca/libkeduca/kgallerydialog.h +++ b/keduca/libkeduca/kgallerydialog.h @@ -34,7 +34,7 @@ class KTempFile; namespace TDEIO { class Job; } class KGalleryDialog : public KGalleryDialogBase { - Q_OBJECT + TQ_OBJECT public: KGalleryDialog(TQWidget *parent=0, const char *name=0); diff --git a/keduca/libkeduca/kgallerydialogbase.ui b/keduca/libkeduca/kgallerydialogbase.ui index 5150ee42..f530fd86 100644 --- a/keduca/libkeduca/kgallerydialogbase.ui +++ b/keduca/libkeduca/kgallerydialogbase.ui @@ -362,9 +362,9 @@ <slot>slotServerSelected(TQListViewItem*)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotButtonAdd()</slot> <slot>slotServerSelected(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> |