diff options
Diffstat (limited to 'klinkstatus/src/engine')
-rw-r--r-- | klinkstatus/src/engine/CMakeLists.txt | 30 | ||||
-rw-r--r-- | klinkstatus/src/engine/linkchecker.cpp | 20 | ||||
-rw-r--r-- | klinkstatus/src/engine/linkchecker.h | 2 | ||||
-rw-r--r-- | klinkstatus/src/engine/searchmanager.cpp | 22 | ||||
-rw-r--r-- | klinkstatus/src/engine/searchmanager.h | 2 |
5 files changed, 53 insertions, 23 deletions
diff --git a/klinkstatus/src/engine/CMakeLists.txt b/klinkstatus/src/engine/CMakeLists.txt new file mode 100644 index 00000000..21cd32ae --- /dev/null +++ b/klinkstatus/src/engine/CMakeLists.txt @@ -0,0 +1,30 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/ui +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### engine (static) + +tde_add_library( engine STATIC_PIC AUTOMOC + + SOURCES + linkchecker.cpp + linkstatus.cpp + searchmanager.cpp + linkfilter.cpp + LINK + tdehtml-shared +) diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp index 134b9582..1f36c485 100644 --- a/klinkstatus/src/engine/linkchecker.cpp +++ b/klinkstatus/src/engine/linkchecker.cpp @@ -97,16 +97,16 @@ void LinkChecker::check() t_job_->addMetaData("SendUserAgent", "false"); - TQObject::connect(t_job_, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - TQObject::connect(t_job_, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), - this, TQT_SLOT(slotMimetype(TDEIO::Job *, const TQString &))); - TQObject::connect(t_job_, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotResult(TDEIO::Job *))); - TQObject::connect(t_job_, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL &)), - this, TQT_SLOT(slotRedirection(TDEIO::Job *, const KURL &))); + TQObject::connect(t_job_, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + TQObject::connect(t_job_, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + this, TQ_SLOT(slotMimetype(TDEIO::Job *, const TQString &))); + TQObject::connect(t_job_, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotResult(TDEIO::Job *))); + TQObject::connect(t_job_, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL &)), + this, TQ_SLOT(slotRedirection(TDEIO::Job *, const KURL &))); - TQTimer::singleShot( time_out_ * 1000, this, TQT_SLOT(slotTimeOut()) ); + TQTimer::singleShot( time_out_ * 1000, this, TQ_SLOT(slotTimeOut()) ); t_job_->setInteractive(false); } @@ -277,7 +277,7 @@ void LinkChecker::slotData(TDEIO::Job* /*job*/, const TQByteArray& data) TQTextCodec* codec = 0; if(has_defined_charset_) - codec = TQTextCodec::codecForName(document_charset_); + codec = TQTextCodec::codecForName(document_charset_.latin1()); if(!codec) codec = TQTextCodec::codecForName("iso8859-1"); // default diff --git a/klinkstatus/src/engine/linkchecker.h b/klinkstatus/src/engine/linkchecker.h index a29d6445..050eaf87 100644 --- a/klinkstatus/src/engine/linkchecker.h +++ b/klinkstatus/src/engine/linkchecker.h @@ -39,7 +39,7 @@ using namespace std; */ class LinkChecker : public TQObject { - Q_OBJECT + TQ_OBJECT public: LinkChecker(LinkStatus* linkstatus, int time_out = 50, diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp index 45fdc24b..6e4f656a 100644 --- a/klinkstatus/src/engine/searchmanager.cpp +++ b/klinkstatus/src/engine/searchmanager.cpp @@ -191,11 +191,11 @@ void SearchManager::checkRoot() LinkChecker* checker = new LinkChecker(&root_, time_out_, this, "link_checker"); checker->setSearchManager(this); - connect(checker, TQT_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)), - this, TQT_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *))); + connect(checker, TQ_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)), + this, TQ_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *))); /* - connect(checker, TQT_SIGNAL(jobFinnished(LinkChecker *)), - this, TQT_SLOT(slotLinkCheckerFinnished(LinkChecker *))); + connect(checker, TQ_SIGNAL(jobFinnished(LinkChecker *)), + this, TQ_SLOT(slotLinkCheckerFinnished(LinkChecker *))); */ checker->check(); } @@ -314,7 +314,7 @@ vector<LinkStatus*> SearchManager::children(LinkStatus* link) } if(count == 50) { - kapp->processEvents(); + tdeApp->processEvents(); count = 0; } } @@ -374,7 +374,7 @@ LinkStatus const* SearchManager::linkStatus(TQString const& s_url) const if(count == 50) { count = 0; - kapp->processEvents(); + tdeApp->processEvents(); } } @@ -524,11 +524,11 @@ void SearchManager::checkLinksSimultaneously(vector<LinkStatus*> const& links) LinkChecker* checker = new LinkChecker(ls, time_out_, this, "link_checker"); checker->setSearchManager(this); - connect(checker, TQT_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)), - this, TQT_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *))); + connect(checker, TQ_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)), + this, TQ_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *))); /* - connect(checker, TQT_SIGNAL(jobFinnished(LinkChecker *)), - this, TQT_SLOT(slotLinkCheckerFinnished(LinkChecker *))); + connect(checker, TQ_SIGNAL(jobFinnished(LinkChecker *)), + this, TQ_SLOT(slotLinkCheckerFinnished(LinkChecker *))); */ checker->check(); } @@ -599,7 +599,7 @@ void SearchManager::addLevel() } emit signalAddingLevelProgress(); -// kapp->processEvents(); +// tdeApp->processEvents(); } } if( (search_results_[search_results_.size() - 1]).size() == 0 ) diff --git a/klinkstatus/src/engine/searchmanager.h b/klinkstatus/src/engine/searchmanager.h index c60281c7..943c94ed 100644 --- a/klinkstatus/src/engine/searchmanager.h +++ b/klinkstatus/src/engine/searchmanager.h @@ -43,7 +43,7 @@ typedef TQMap<TQString, TDEHTMLPart*> TDEHTMLPartMap; class SearchManager: public TQObject { - Q_OBJECT + TQ_OBJECT public: |