diff options
Diffstat (limited to 'ark')
-rw-r--r-- | ark/CMakeLists.txt | 2 | ||||
-rw-r--r-- | ark/Makefile.am | 8 | ||||
-rw-r--r-- | ark/arch.cpp | 2 | ||||
-rw-r--r-- | ark/arj.cpp | 2 | ||||
-rw-r--r-- | ark/arkutils.cpp (renamed from ark/artdeutils.cpp) | 2 | ||||
-rw-r--r-- | ark/arkutils.h (renamed from ark/artdeutils.h) | 0 | ||||
-rw-r--r-- | ark/arkwidget.cpp | 2 | ||||
-rw-r--r-- | ark/extractiondialog.cpp | 4 | ||||
-rw-r--r-- | ark/lha.cpp | 2 | ||||
-rw-r--r-- | ark/rar.cpp | 2 | ||||
-rw-r--r-- | ark/sevenzip.cpp | 2 | ||||
-rw-r--r-- | ark/zoo.cpp | 2 |
12 files changed, 15 insertions, 15 deletions
diff --git a/ark/CMakeLists.txt b/ark/CMakeLists.txt index c0ea58a..329fb47 100644 --- a/ark/CMakeLists.txt +++ b/ark/CMakeLists.txt @@ -49,7 +49,7 @@ tde_add_kpart( libarkpart AUTOMOC SOURCES ark_part.cpp arkfactory.cpp zip.cpp tar.cpp filelistview.cpp arch.cpp lha.cpp compressedfile.cpp zoo.cpp rar.cpp ar.cpp - artdeutils.cpp archiveformatdlg.cpp + arkutils.cpp archiveformatdlg.cpp arkwidget.cpp searchbar.cpp addition.ui extraction.ui general.ui arkviewer.cpp sevenzip.cpp extractiondialog.cpp ace.cpp diff --git a/ark/Makefile.am b/ark/Makefile.am index bf14490..60f5fe8 100644 --- a/ark/Makefile.am +++ b/ark/Makefile.am @@ -10,24 +10,24 @@ lib_LTLIBRARIES = ark_la_SOURCES = main.cpp arkapp.cpp mainwindow.cpp ark_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(KDE_PLUGIN) -ark_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) libark_common.la $(LIB_KPARTS) +ark_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) libark_common.la $(LIB_TDEPARTS) ark_la_COMPILE_FIRST = settings.h noinst_LTLIBRARIES = libark_common.la libark_common_la_SOURCES = settings.kcfgc archiveformatinfo.cpp libark_common_la_LDFLAGS = $(all_libraries) -no-undefined -libark_common_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIB_TDEFILE) +libark_common_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEFILE) kde_module_LTLIBRARIES = libarkpart.la libarkpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -libarkpart_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) libark_common.la $(LIB_KPARTS) +libarkpart_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) libark_common.la $(LIB_TDEPARTS) libarkpart_la_COMPILE_FIRST = settings.h libarkpart_la_SOURCES = ark_part.cpp arkfactory.cpp zip.cpp tar.cpp \ filelistview.cpp arch.cpp lha.cpp \ compressedfile.cpp zoo.cpp rar.cpp \ - ar.cpp artdeutils.cpp archiveformatdlg.cpp \ + ar.cpp arkutils.cpp archiveformatdlg.cpp \ arkwidget.cpp searchbar.cpp \ addition.ui extraction.ui general.ui \ arkviewer.cpp sevenzip.cpp extractiondialog.cpp \ diff --git a/ark/arch.cpp b/ark/arch.cpp index 2ca8ec5..eb5606b 100644 --- a/ark/arch.cpp +++ b/ark/arch.cpp @@ -47,7 +47,7 @@ // ark includes #include "arch.h" #include "arkwidget.h" -#include "artdeutils.h" +#include "arkutils.h" #include "filelistview.h" // the archive types diff --git a/ark/arj.cpp b/ark/arj.cpp index f081e17..4a9ab44 100644 --- a/ark/arj.cpp +++ b/ark/arj.cpp @@ -42,7 +42,7 @@ #include "arj.h" #include "arkwidget.h" #include "settings.h" -#include "artdeutils.h" +#include "arkutils.h" #include "filelistview.h" ArjArch::ArjArch( ArkWidget *_gui, const TQString & _fileName ) diff --git a/ark/artdeutils.cpp b/ark/arkutils.cpp index bdfec3f..24411e8 100644 --- a/ark/artdeutils.cpp +++ b/ark/arkutils.cpp @@ -72,7 +72,7 @@ // TQt includes #include <tqfile.h> -#include "artdeutils.h" +#include "arkutils.h" TQString ArkUtils::getTimeStamp(const TQString &_month, const TQString &_day, diff --git a/ark/artdeutils.h b/ark/arkutils.h index c53791f..c53791f 100644 --- a/ark/artdeutils.h +++ b/ark/arkutils.h diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp index 5dacb77..9dfcf42 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -75,7 +75,7 @@ #include "extractiondialog.h" #include "arkwidget.h" #include "filelistview.h" -#include "artdeutils.h" +#include "arkutils.h" #include "archiveformatinfo.h" #include "compressedfile.h" #include "searchbar.h" diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp index 0684ca1..f4b5196 100644 --- a/ark/extractiondialog.cpp +++ b/ark/extractiondialog.cpp @@ -48,7 +48,7 @@ #include <kurlpixmapprovider.h> #include <kdebug.h> -#include "artdeutils.h" +#include "arkutils.h" #include "settings.h" ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name, @@ -139,7 +139,7 @@ void ExtractionDialog::accept() uc.setReplaceHome( true ); KURL p( uc.replacedPath( m_urlRequester->comboBox()->currentText() ) ); - //if p isn't local KIO and friends will complain later on + //if p isn't local TDEIO and friends will complain later on if ( p.isLocalFile() ) { TQFileInfo fi( p.path() ); diff --git a/ark/lha.cpp b/ark/lha.cpp index 18a31db..101277d 100644 --- a/ark/lha.cpp +++ b/ark/lha.cpp @@ -49,7 +49,7 @@ #include "settings.h" #include "arch.h" #include "lha.h" -#include "artdeutils.h" +#include "arkutils.h" #include "filelistview.h" LhaArch::LhaArch( ArkWidget *_gui, const TQString & _fileName ) diff --git a/ark/rar.cpp b/ark/rar.cpp index 5878769..4d6a7ce 100644 --- a/ark/rar.cpp +++ b/ark/rar.cpp @@ -49,7 +49,7 @@ #include "arch.h" #include "settings.h" #include "rar.h" -#include "artdeutils.h" +#include "arkutils.h" #include "filelistview.h" RarArch::RarArch( ArkWidget *_gui, const TQString & _fileName ) diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp index 3f5fff2..287ec3b 100644 --- a/ark/sevenzip.cpp +++ b/ark/sevenzip.cpp @@ -39,7 +39,7 @@ #include "sevenzip.h" #include "arkwidget.h" #include "settings.h" -#include "artdeutils.h" +#include "arkutils.h" #include "filelistview.h" SevenZipArch::SevenZipArch( ArkWidget *gui, const TQString &filename ) diff --git a/ark/zoo.cpp b/ark/zoo.cpp index e173415..aa96d47 100644 --- a/ark/zoo.cpp +++ b/ark/zoo.cpp @@ -46,7 +46,7 @@ #include "arkwidget.h" #include "arch.h" #include "zoo.h" -#include "artdeutils.h" +#include "arkutils.h" #include "filelistview.h" static TQString fixTime( const TQString &_strTime ); |