summaryrefslogtreecommitdiffstats
path: root/konqueror/preloader
diff options
context:
space:
mode:
Diffstat (limited to 'konqueror/preloader')
-rw-r--r--konqueror/preloader/CMakeLists.txt2
-rw-r--r--konqueror/preloader/Makefile.am2
-rw-r--r--konqueror/preloader/configure.in.in2
-rw-r--r--konqueror/preloader/preloader.cpp (renamed from konqueror/preloader/preloader.cc)12
-rw-r--r--konqueror/preloader/preloader.h2
5 files changed, 10 insertions, 10 deletions
diff --git a/konqueror/preloader/CMakeLists.txt b/konqueror/preloader/CMakeLists.txt
index 90e72194b..f5610a0ae 100644
--- a/konqueror/preloader/CMakeLists.txt
+++ b/konqueror/preloader/CMakeLists.txt
@@ -42,7 +42,7 @@ tde_create_translated_desktop(
set( target kded_konqy_preloader )
set( ${target}_SRCS
- preloader.cc preloader.skel
+ preloader.cpp preloader.skel
)
tde_add_kpart( ${target} AUTOMOC
diff --git a/konqueror/preloader/Makefile.am b/konqueror/preloader/Makefile.am
index ff2440b0d..9c446faa8 100644
--- a/konqueror/preloader/Makefile.am
+++ b/konqueror/preloader/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DTQT_NO_CAST_ASCII
kde_module_LTLIBRARIES = kded_konqy_preloader.la
INCLUDES= -I.. $(all_includes)
-kded_konqy_preloader_la_SOURCES = preloader.cc preloader.skel
+kded_konqy_preloader_la_SOURCES = preloader.cpp preloader.skel
kded_konqy_preloader_la_LDFLAGS = $(all_libraries) -module -avoid-version
kded_konqy_preloader_la_LIBADD = ../libkonqueror_intern.la $(LIB_TDESYCOCA) $(LIB_TDECORE)
diff --git a/konqueror/preloader/configure.in.in b/konqueror/preloader/configure.in.in
index 315b23c97..a581917cb 100644
--- a/konqueror/preloader/configure.in.in
+++ b/konqueror/preloader/configure.in.in
@@ -1,5 +1,5 @@
dnl check whether mallinfo() is available and which fields to use to find out memory usage
-dnl it's used in konq_mainwindow.cc
+dnl it's used in konq_mainwindow.cpp
dnl warning, ugly code ahead
dnl some implementations have mallinfo() in stdlib.h, others in malloc.h
dnl fields showing memory usage should be hblkhd, uordblks and usmblks,
diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cpp
index 5d87a8b07..4b9e375d7 100644
--- a/konqueror/preloader/preloader.cc
+++ b/konqueror/preloader/preloader.cpp
@@ -30,10 +30,10 @@ KonqyPreloader::KonqyPreloader( const TQCString& obj )
: KDEDModule( obj )
{
reconfigure();
- connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& )),
- TQT_SLOT( appRemoved( const TQCString& )));
- connect( &check_always_preloaded_timer, TQT_SIGNAL( timeout()),
- TQT_SLOT( checkAlwaysPreloaded()));
+ connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& )),
+ TQ_SLOT( appRemoved( const TQCString& )));
+ connect( &check_always_preloaded_timer, TQ_SIGNAL( timeout()),
+ TQ_SLOT( checkAlwaysPreloaded()));
}
KonqyPreloader::~KonqyPreloader()
@@ -109,7 +109,7 @@ void KonqyPreloader::updateCount()
{
if( !check_always_preloaded_timer.isActive())
{
- if( kapp->tdeinitExec( TQString::fromLatin1( "konqueror" ),
+ if( tdeApp->tdeinitExec( TQString::fromLatin1( "konqueror" ),
TQStringList() << TQString::fromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 )
{
kdDebug( 1202 ) << "Preloading Konqueror instance" << endl;
@@ -143,7 +143,7 @@ void KonqyPreloader::unloadAllPreloaded()
}
extern "C"
-KDE_EXPORT KDEDModule *create_konqy_preloader( const TQCString& obj )
+TDE_EXPORT KDEDModule *create_konqy_preloader( const TQCString& obj )
{
return new KonqyPreloader( obj );
}
diff --git a/konqueror/preloader/preloader.h b/konqueror/preloader/preloader.h
index c2767522b..220c0d15f 100644
--- a/konqueror/preloader/preloader.h
+++ b/konqueror/preloader/preloader.h
@@ -26,7 +26,7 @@
class KonqyPreloader
: public KDEDModule
{
- Q_OBJECT
+ TQ_OBJECT
K_DCOP
public:
KonqyPreloader( const TQCString& obj );