diff options
Diffstat (limited to 'klinkstatus')
57 files changed, 497 insertions, 233 deletions
diff --git a/klinkstatus/CMakeLists.txt b/klinkstatus/CMakeLists.txt new file mode 100644 index 00000000..08aee1f1 --- /dev/null +++ b/klinkstatus/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory( data ) +add_subdirectory( src ) diff --git a/klinkstatus/data/CMakeLists.txt b/klinkstatus/data/CMakeLists.txt new file mode 100644 index 00000000..4a0967ef --- /dev/null +++ b/klinkstatus/data/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory( icons ) +add_subdirectory( styles ) diff --git a/klinkstatus/data/icons/16x16/CMakeLists.txt b/klinkstatus/data/icons/16x16/CMakeLists.txt new file mode 100644 index 00000000..f83c3ba4 --- /dev/null +++ b/klinkstatus/data/icons/16x16/CMakeLists.txt @@ -0,0 +1,8 @@ +##### icons + +install( + FILES 304.png + DESTINATION ${DATA_INSTALL_DIR}/klinkstatuspart/pics +) + +tde_install_icons() diff --git a/klinkstatus/data/icons/16x16/cr16-action-bug.png b/klinkstatus/data/icons/16x16/cr16-action-bug.png Binary files differdeleted file mode 100644 index 766bb8cf..00000000 --- a/klinkstatus/data/icons/16x16/cr16-action-bug.png +++ /dev/null diff --git a/klinkstatus/data/icons/22x22/Makefile.am b/klinkstatus/data/icons/22x22/Makefile.am deleted file mode 100644 index bdcbfad2..00000000 --- a/klinkstatus/data/icons/22x22/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -klinkstatusicondir = $(kde_datadir)/klinkstatuspart/pics diff --git a/klinkstatus/data/icons/32x32/Makefile.am b/klinkstatus/data/icons/32x32/Makefile.am deleted file mode 100644 index 5d234f12..00000000 --- a/klinkstatus/data/icons/32x32/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -klinkstatusicondir = $(kde_datadir)/klinkstatuspart/pics - diff --git a/klinkstatus/data/icons/CMakeLists.txt b/klinkstatus/data/icons/CMakeLists.txt new file mode 100644 index 00000000..33315642 --- /dev/null +++ b/klinkstatus/data/icons/CMakeLists.txt @@ -0,0 +1,6 @@ +add_subdirectory( 16x16 ) + + +##### icons + +tde_install_icons( klinkstatus ) diff --git a/klinkstatus/data/icons/Makefile.am b/klinkstatus/data/icons/Makefile.am index 14f1949a..f9317118 100644 --- a/klinkstatus/data/icons/Makefile.am +++ b/klinkstatus/data/icons/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = 32x32 22x22 16x16 +SUBDIRS = 16x16 KDE_ICON = klinkstatus diff --git a/klinkstatus/data/styles/CMakeLists.txt b/klinkstatus/data/styles/CMakeLists.txt new file mode 100644 index 00000000..7370d82e --- /dev/null +++ b/klinkstatus/data/styles/CMakeLists.txt @@ -0,0 +1,4 @@ +install( + FILES results_stylesheet.xsl + DESTINATION ${DATA_INSTALL_DIR}/klinkstatus/styles +) diff --git a/klinkstatus/klinkstatus.tdevelop b/klinkstatus/klinkstatus.tdevelop index fe98acbc..dfa6da01 100644 --- a/klinkstatus/klinkstatus.tdevelop +++ b/klinkstatus/klinkstatus.tdevelop @@ -47,7 +47,7 @@ <ccompiler>tdevgccoptions</ccompiler> <cxxcompiler>tdevgppoptions</cxxcompiler> <f77compiler>tdevg77options</f77compiler> - <cxxflags>-DKDE_NO_COMPAT -DTQT_NO_COMPAT -DQT_FATAL_ASSERT</cxxflags> + <cxxflags>-DKDE_NO_COMPAT -DQT_FATAL_ASSERT</cxxflags> <topsourcedir>..</topsourcedir> <cppflags/> <ldflags/> diff --git a/klinkstatus/src/CMakeL10n.txt b/klinkstatus/src/CMakeL10n.txt index 15d6cad7..3e197d38 100644 --- a/klinkstatus/src/CMakeL10n.txt +++ b/klinkstatus/src/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_create_template( "klinkstatus" ) + +tde_l10n_create_template( + CATALOG "desktop_files/klinkstatus-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/klinkstatus/src/CMakeLists.txt b/klinkstatus/src/CMakeLists.txt new file mode 100644 index 00000000..8b657494 --- /dev/null +++ b/klinkstatus/src/CMakeLists.txt @@ -0,0 +1,94 @@ +add_subdirectory( cfg ) +add_subdirectory( engine ) +add_subdirectory( parser ) +add_subdirectory( utils ) +add_subdirectory( ui ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/klinkstatus/src/ui + ${CMAKE_BINARY_DIR}/klinkstatus/src/ui/settings +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### libklinkstatuspart (kpart) + +tde_add_kpart( libklinkstatuspart AUTOMOC + + SOURCES + klinkstatus_part.cpp + global.cpp + actionmanager.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + tdeparts-shared + settings-static + ui-static + engine-static + klinkstatus-parser-static + utils-static + + DEPENDENCIES + ui-static + settings-static + engine-static + klinkstatus-parser-static + utils-static + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### klinkstatus (executable) + +tde_add_executable( klinkstatus AUTOMOC + + SOURCES + klinkstatus.cpp + main.cpp + LINK + tdecore-shared + tdeui-shared + tdeparts-shared + klinkstatus-parser-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### other data + +install( + FILES klinkstatus_shell.rc + DESTINATION ${DATA_INSTALL_DIR}/klinkstatus +) + +tde_create_translated_desktop( + SOURCE klinkstatus.desktop + PO_DIR klinkstatus-desktops +) + +tde_create_translated_desktop( + SOURCE klinkstatus_part.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR klinkstatus-desktops +) + +install( + FILES klinkstatus_part.rc + DESTINATION ${DATA_INSTALL_DIR}/klinkstatuspart +) diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp index 6c8ef1a6..26a969df 100644 --- a/klinkstatus/src/actionmanager.cpp +++ b/klinkstatus/src/actionmanager.cpp @@ -89,34 +89,34 @@ void ActionManager::initPart(KLinkStatusPart* part) new TDEAction(i18n("New Link Check"), "document-new", 0, - d->part, TQT_SLOT(slotNewLinkCheck()), - TQT_TQOBJECT(d->actionCollection), "new_link_check"); + d->part, TQ_SLOT(slotNewLinkCheck()), + d->actionCollection, "new_link_check"); new TDEAction(i18n("Open URL..."), "document-open", 0, - d->part, TQT_SLOT(slotOpenLink()), - TQT_TQOBJECT(d->actionCollection), "open_link"); + d->part, TQ_SLOT(slotOpenLink()), + d->actionCollection, "open_link"); action = new TDEAction(i18n("Close Tab"), "window-close", 0, - d->part, TQT_SLOT(slotClose()), - TQT_TQOBJECT(d->actionCollection), "close_tab"); + d->part, TQ_SLOT(slotClose()), + d->actionCollection, "close_tab"); action->setEnabled(false); // *************** Settings menu ********************* (void) new TDEAction(i18n("Configure KLinkStatus..."), "configure", - 0, d->part, TQT_SLOT(slotConfigureKLinkStatus()), - TQT_TQOBJECT(d->actionCollection), "configure_klinkstatus"); + 0, d->part, TQ_SLOT(slotConfigureKLinkStatus()), + d->actionCollection, "configure_klinkstatus"); // *************** Help menu ********************* (void) new TDEAction(i18n("About KLinkStatus"), "klinkstatus", - 0, d->part, TQT_SLOT(slotAbout()), - TQT_TQOBJECT(d->actionCollection), "about_klinkstatus"); + 0, d->part, TQ_SLOT(slotAbout()), + d->actionCollection, "about_klinkstatus"); (void) new TDEAction(i18n("&Report Bug..."), 0, 0, d->part, - TQT_SLOT(slotReportBug()), TQT_TQOBJECT(d->actionCollection), "report_bug"); + TQ_SLOT(slotReportBug()), d->actionCollection, "report_bug"); // *************** View menu ********************* } @@ -133,8 +133,8 @@ void ActionManager::initTabWidget(TabWidgetSession* tabWidgetSession) // *************** File menu ********************* TDEAction* action = new TDEAction(i18n("E&xport Results as HTML..."), "document-save", 0, - TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotExportAsHTML()), - TQT_TQOBJECT(d->actionCollection), "file_export_html"); + d->tabWidgetSession, TQ_SLOT(slotExportAsHTML()), + d->actionCollection, "file_export_html"); action->setEnabled(false); // *************** View menu ********************* @@ -142,39 +142,39 @@ void ActionManager::initTabWidget(TabWidgetSession* tabWidgetSession) // this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget TDEToggleAction* toggle_action = new TDEToggleAction(i18n("&Follow last Link checked"), "make_tdevelop", "Ctrl+f", - TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotFollowLastLinkChecked()), - TQT_TQOBJECT(d->actionCollection), "follow_last_link_checked"); + d->tabWidgetSession, TQ_SLOT(slotFollowLastLinkChecked()), + d->actionCollection, "follow_last_link_checked"); toggle_action->setChecked(KLSConfig::followLastLinkChecked()); // this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget toggle_action = new TDEToggleAction(i18n("&Hide Search Panel"), "go-bottom", "Ctrl+h", - TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotHideSearchPanel()), - TQT_TQOBJECT(d->actionCollection), "hide_search_bar"); + d->tabWidgetSession, TQ_SLOT(slotHideSearchPanel()), + d->actionCollection, "hide_search_bar"); KGuiItem item(i18n("&Show Search Panel"), "go-top", "Show Search Panel"); toggle_action->setCheckedState(item); new TDEAction(i18n("&Reset Search Options"), "reload", "F5", - TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotResetSearchOptions()), - TQT_TQOBJECT(d->actionCollection), "reset_search_bar"); + d->tabWidgetSession, TQ_SLOT(slotResetSearchOptions()), + d->actionCollection, "reset_search_bar"); // *************** Search menu ********************* toggle_action = new TDEToggleAction(i18n("&Start Search"), "media-playback-start", "Ctrl+s", - TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotStartSearch()), - TQT_TQOBJECT(d->actionCollection), "start_search"); + d->tabWidgetSession, TQ_SLOT(slotStartSearch()), + d->actionCollection, "start_search"); toggle_action->setEnabled(false); toggle_action = new TDEToggleAction(i18n("&Pause Search"), "media-playback-pause", "Ctrl+p", - TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotPauseSearch()), - TQT_TQOBJECT(d->actionCollection), "pause_search"); + d->tabWidgetSession, TQ_SLOT(slotPauseSearch()), + d->actionCollection, "pause_search"); toggle_action->setEnabled(false); action = new TDEAction(i18n("St&op Search"), "media-playback-stop", "Ctrl+c", - TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotStopSearch()), - TQT_TQOBJECT(d->actionCollection), "stop_search"); + d->tabWidgetSession, TQ_SLOT(slotStopSearch()), + d->actionCollection, "stop_search"); action->setEnabled(false); } diff --git a/klinkstatus/src/actionmanager.h b/klinkstatus/src/actionmanager.h index 15584b0c..66303d57 100644 --- a/klinkstatus/src/actionmanager.h +++ b/klinkstatus/src/actionmanager.h @@ -36,7 +36,7 @@ class TabWidgetSession; */ class ActionManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: ActionManager(TQObject* parent=0, const char* name=0); diff --git a/klinkstatus/src/cfg/CMakeLists.txt b/klinkstatus/src/cfg/CMakeLists.txt new file mode 100644 index 00000000..f5f9a1f3 --- /dev/null +++ b/klinkstatus/src/cfg/CMakeLists.txt @@ -0,0 +1,35 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### cfg (static) + +configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY ) + +tde_add_library( cfg STATIC_PIC AUTOMOC + + SOURCES + klsconfig.kcfgc + dummy.cpp +) + + +##### other data + +install( + FILES klinkstatus.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) diff --git a/klinkstatus/src/cfg/Makefile.am b/klinkstatus/src/cfg/Makefile.am index 2e74b2ad..02107718 100644 --- a/klinkstatus/src/cfg/Makefile.am +++ b/klinkstatus/src/cfg/Makefile.am @@ -2,5 +2,9 @@ kde_kcfg_DATA = klinkstatus.kcfg METASOURCES = AUTO libcfg_la_LDFLAGS = $(all_libraries) noinst_LTLIBRARIES = libcfg.la +CLEANFILES = dummy.cpp libcfg_la_SOURCES = dummy.cpp klsconfig.kcfgc -AM_CPPFLAGS=$(all_includes)
\ No newline at end of file +AM_CPPFLAGS=$(all_includes) + +dummy.cpp: + echo > dummy.cpp diff --git a/klinkstatus/src/cfg/dummy.cpp b/klinkstatus/src/cfg/dummy.cpp deleted file mode 100644 index e69de29b..00000000 --- a/klinkstatus/src/cfg/dummy.cpp +++ /dev/null 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..e05087d1 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(); } @@ -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(); } 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: diff --git a/klinkstatus/src/global.cpp b/klinkstatus/src/global.cpp index 4fa6d88f..6a24578f 100644 --- a/klinkstatus/src/global.cpp +++ b/klinkstatus/src/global.cpp @@ -111,7 +111,7 @@ TQCString Global::quantaDCOPAppId() { ps_list[i] = ps_list[i].stripWhiteSpace (); if(self()->dcop_client_->isApplicationRegistered("quanta-" + ps_list[i].local8Bit())) - app_id = "quanta-" + ps_list[i]; + app_id = "quanta-" + ps_list[i].utf8(); } } @@ -149,12 +149,12 @@ void Global::execCommand(TQString const& command) self()->process_PS_ = new TDEProcess(); *(self()->process_PS_) << TQStringList::split(" ",command); - connect( self()->process_PS_, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - self(), TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); - connect( self()->process_PS_, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - self(), TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int))); - connect( self()->process_PS_, TQT_SIGNAL(processExited(TDEProcess*)), - self(), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect( self()->process_PS_, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + self(), TQ_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); + connect( self()->process_PS_, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + self(), TQ_SLOT(slotGetScriptError(TDEProcess*,char*,int))); + connect( self()->process_PS_, TQ_SIGNAL(processExited(TDEProcess*)), + self(), TQ_SLOT(slotProcessExited(TDEProcess*))); //if TDEProcess fails I think a message box is needed... I will fix it if (!self()->process_PS_->start(TDEProcess::NotifyOnExit,TDEProcess::All)) @@ -164,8 +164,8 @@ void Global::execCommand(TQString const& command) { //To avoid lock-ups, start a timer. TQTimer* timer = new TQTimer(self()); - connect(timer, TQT_SIGNAL(timeout()), - self(), TQT_SLOT(slotProcessTimeout())); + connect(timer, TQ_SIGNAL(timeout()), + self(), TQ_SLOT(slotProcessTimeout())); timer->start(120*1000, true); self()->loop_started_ = true; kapp->enter_loop(); diff --git a/klinkstatus/src/global.h b/klinkstatus/src/global.h index a91d3b6d..86b3cbd1 100644 --- a/klinkstatus/src/global.h +++ b/klinkstatus/src/global.h @@ -24,7 +24,7 @@ class TDEProcess; */ class Global : public TQObject { - Q_OBJECT + TQ_OBJECT public: static Global* self(); diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp index f4154f3c..7a125bb5 100644 --- a/klinkstatus/src/klinkstatus.cpp +++ b/klinkstatus/src/klinkstatus.cpp @@ -54,7 +54,7 @@ KLinkStatus::KLinkStatus() { // now that the Part is loaded, we cast it to a Part to get // our hands on it - m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this), + m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this, "klinkstatus_part", "KParts::ReadOnlyPart" )); if (m_part) @@ -97,7 +97,7 @@ void KLinkStatus::load(const KURL& url) void KLinkStatus::setupActions() { - // KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + // KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); // The above causes a segfault when using File->Quit. // Here's Waldo's explanation: /* I had a look. The problem is due to the SessionWidget destructor calling @@ -113,13 +113,13 @@ void KLinkStatus::setupActions() administration. The easiest solution is to call close() on the mainwindow instead of TDEApplication::quit()*/ - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); - //m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - //m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + //m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + //m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void KLinkStatus::setupPartActions() @@ -199,8 +199,8 @@ void KLinkStatus::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/klinkstatus/src/klinkstatus.desktop b/klinkstatus/src/klinkstatus.desktop index bc5a910a..0755d346 100644 --- a/klinkstatus/src/klinkstatus.desktop +++ b/klinkstatus/src/klinkstatus.desktop @@ -1,54 +1,11 @@ [Desktop Entry] Name=KLinkStatus -Name[ne]=केडीई लिङ्क स्थिति -Name[sk]=KLink status -Name[sv]=Klinkstatus -Name[ta]=Kதொகுதி நிலைமை -Name[tr]=K Köprü Durumu + +GenericName=Link Checker + +Type=Application Exec=klinkstatus %i %m -caption "%c" Icon=klinkstatus -Type=Application -X-DocPath=klinkstatus/index.html Terminal=false -GenericName=Link Checker -GenericName[bg]=Проверка на препратки -GenericName[ca]=Comprovador d'enllaços -GenericName[cs]=Kontrola odkazů -GenericName[da]=Link-tjekker -GenericName[de]=Überprüfungswerkzeug für Verknüpfungen -GenericName[el]=Ελεγκτής σύνδεσης -GenericName[es]=Comprobador de enlaces -GenericName[et]=Viidakontrollija -GenericName[eu]=Esteka egiaztatzailea -GenericName[fa]=بررسیکنندۀ پیوند -GenericName[fi]=Linkkien tarkistaja -GenericName[fr]=Vérificateur de liens -GenericName[gl]=Verificador de ligazóns -GenericName[hu]=Linkellenőrző -GenericName[is]=Yfirfer tengla -GenericName[it]=Controllo dei collegamenti -GenericName[ja]=リンクチェッカー -GenericName[ka]=ბმულების შემმოწმებელი -GenericName[lt]=Nuorody tikrintuvė -GenericName[ms]=Pemeriksa Pautan -GenericName[nds]=Linkprööv -GenericName[ne]=लिङ्क परीक्षक -GenericName[nl]=Linkchecker -GenericName[pl]=Program sprawdzający odnośniki -GenericName[pt]=Verificação de Ligações -GenericName[pt_BR]=Verificador de Links -GenericName[ru]=Проверка ссылок -GenericName[sk]=Kontrole spojenia -GenericName[sl]=Preverjalnik povezav -GenericName[sr]=Провера везе -GenericName[sr@Latn]=Provera veze -GenericName[sv]=Länkkontroll -GenericName[ta]=இணைப்பு சரிபார்ப்பான் -GenericName[tg]=Тафтиши истинод -GenericName[tr]=Bağlantı Kontrolcüsü -GenericName[uk]=Перевірка посилань -GenericName[zh_CN]=链接检查器 -GenericName[zh_HK]=連結檢查程式 -GenericName[zh_TW]=連結檢查程式 +X-DocPath=klinkstatus/index.html Categories=Qt;TDE;Development;WebDevelopment; - diff --git a/klinkstatus/src/klinkstatus.h b/klinkstatus/src/klinkstatus.h index 1d2e3bdf..1c471234 100644 --- a/klinkstatus/src/klinkstatus.h +++ b/klinkstatus/src/klinkstatus.h @@ -22,7 +22,7 @@ #define _KLINKSTATUS_H_ #ifdef HAVE_CONFIG_H -#include <config.h> +#include "config.h" #endif #include <tdeapplication.h> @@ -40,7 +40,7 @@ class TDEToggleAction; */ class KLinkStatus : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: KLinkStatus(); diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp index bf8e1db7..6b379387 100644 --- a/klinkstatus/src/klinkstatus_part.cpp +++ b/klinkstatus/src/klinkstatus_part.cpp @@ -153,7 +153,7 @@ void KLinkStatusPart::slotConfigureKLinkStatus() dialog->addPage(new ConfigIdentificationDialog(0), i18n("Identification"), "agent", i18n("Configure the way KLinkstatus reports itself")); dialog->show(); - connect(dialog, TQT_SIGNAL(settingsChanged()), tabwidget_, TQT_SLOT(slotLoadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), tabwidget_, TQ_SLOT(slotLoadSettings())); } void KLinkStatusPart::slotAbout() diff --git a/klinkstatus/src/klinkstatus_part.desktop b/klinkstatus/src/klinkstatus_part.desktop index 70e14bb5..e48ea474 100644 --- a/klinkstatus/src/klinkstatus_part.desktop +++ b/klinkstatus/src/klinkstatus_part.desktop @@ -1,17 +1,8 @@ [Desktop Entry] Name=KLinkStatusPart -Name[de]=KLinkStatus-Komponente -Name[fr]=Composant de KLinkStatus -Name[nds]=KLinkStatus-Komponent -Name[ne]=केडीई लिङ्क वस्तुस्थिति भाग -Name[pt_BR]=Componente do KLinkStatus -Name[ru]=Компонент KLinkStatus -Name[sk]=KLink status Part -Name[sv]=Klinkstatus-delprogram -Name[ta]=Kதொகுதி நிலைமை பகுதி -Name[tg]=Қисми KLinkStatus + +Type=Service Icon=klinkstatus MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart X-TDE-Library=libklinkstatuspart -Type=Service diff --git a/klinkstatus/src/klinkstatus_part.h b/klinkstatus/src/klinkstatus_part.h index 3d8a498e..de91318a 100644 --- a/klinkstatus/src/klinkstatus_part.h +++ b/klinkstatus/src/klinkstatus_part.h @@ -36,7 +36,7 @@ class TDEAction; class KLinkStatusPart: public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: KLinkStatusPart(TQWidget *parentWidget, const char *widgetName, diff --git a/klinkstatus/src/parser/CMakeLists.txt b/klinkstatus/src/parser/CMakeLists.txt new file mode 100644 index 00000000..3a31b799 --- /dev/null +++ b/klinkstatus/src/parser/CMakeLists.txt @@ -0,0 +1,28 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### parser (static) + +tde_add_library( klinkstatus-parser STATIC_PIC AUTOMOC + + SOURCES + htmlparser.cpp + http.cpp + mstring.cpp + node.cpp + url.cpp +) diff --git a/klinkstatus/src/ui/CMakeLists.txt b/klinkstatus/src/ui/CMakeLists.txt new file mode 100644 index 00000000..316b729b --- /dev/null +++ b/klinkstatus/src/ui/CMakeLists.txt @@ -0,0 +1,35 @@ +add_subdirectory( settings ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_BINARY_DIR}/klinkstatus/src/cfg + ${CMAKE_BINARY_DIR}/klinkstatus/src +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### ui (static) + +tde_add_library( ui STATIC_PIC AUTOMOC + + SOURCES + sessionwidgetbase.ui + sessionwidget.cpp tabwidgetsession.cpp + klshistorycombo.cpp resultview.cpp + treeview.cpp resultssearchbar.cpp + documentrootdialog.cpp + LINK + cfg-static +) diff --git a/klinkstatus/src/ui/documentrootdialog.cpp b/klinkstatus/src/ui/documentrootdialog.cpp index 888526a3..1ae0c449 100644 --- a/klinkstatus/src/ui/documentrootdialog.cpp +++ b/klinkstatus/src/ui/documentrootdialog.cpp @@ -53,12 +53,12 @@ DocumentRootDialog::DocumentRootDialog(TQWidget *parent, TQString const& url) m_urlRequester->setMode(KFile::Directory); // enableButtonOK(false); - connect(m_urlRequester, TQT_SIGNAL(textChanged (const TQString &)), - this, TQT_SLOT(slotTextChanged (const TQString &))); - connect(m_urlRequester, TQT_SIGNAL(returnPressed (const TQString &)), - this, TQT_SLOT(slotReturnPressed (const TQString &))); - connect(m_urlRequester, TQT_SIGNAL(urlSelected (const TQString &)), - this, TQT_SLOT(slotTextChanged (const TQString &))); + connect(m_urlRequester, TQ_SIGNAL(textChanged (const TQString &)), + this, TQ_SLOT(slotTextChanged (const TQString &))); + connect(m_urlRequester, TQ_SIGNAL(returnPressed (const TQString &)), + this, TQ_SLOT(slotReturnPressed (const TQString &))); + connect(m_urlRequester, TQ_SIGNAL(urlSelected (const TQString &)), + this, TQ_SLOT(slotTextChanged (const TQString &))); } DocumentRootDialog::~DocumentRootDialog() diff --git a/klinkstatus/src/ui/documentrootdialog.h b/klinkstatus/src/ui/documentrootdialog.h index 0e7ef47d..cbbb6215 100644 --- a/klinkstatus/src/ui/documentrootdialog.h +++ b/klinkstatus/src/ui/documentrootdialog.h @@ -29,7 +29,7 @@ class KURLRequester; */ class DocumentRootDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: DocumentRootDialog(TQWidget *parent, TQString const& url); diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp index 52d884c8..21de0de3 100644 --- a/klinkstatus/src/ui/klshistorycombo.cpp +++ b/klinkstatus/src/ui/klshistorycombo.cpp @@ -32,8 +32,8 @@ KLSHistoryCombo::KLSHistoryCombo(TQWidget *parent, const char *name) setDuplicatesEnabled(false); setAutoCompletion(false); - connect(this, TQT_SIGNAL(activated(const TQString& )), - this, TQT_SLOT(addToHistory(const TQString& ))); + connect(this, TQ_SIGNAL(activated(const TQString& )), + this, TQ_SLOT(addToHistory(const TQString& ))); } KLSHistoryCombo::~KLSHistoryCombo() @@ -79,12 +79,12 @@ bool KLSHistoryCombo::eventFilter( TQObject *o, TQEvent *ev ) // Handle Ctrl+Del/Backspace etc better than the TQt widget, which always // jumps to the next whitespace. TQLineEdit *edit = lineEdit(); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(edit) ) + if ( o == edit ) { int type = ev->type(); if ( type == TQEvent::KeyPress ) { - TQKeyEvent *e = TQT_TQKEYEVENT( ev ); + TQKeyEvent *e = static_cast<TQKeyEvent*>( ev ); if ( e->key() == Key_Return || e->key() == Key_Enter ) { diff --git a/klinkstatus/src/ui/klshistorycombo.h b/klinkstatus/src/ui/klshistorycombo.h index 2b153b82..ba7fb5d3 100644 --- a/klinkstatus/src/ui/klshistorycombo.h +++ b/klinkstatus/src/ui/klshistorycombo.h @@ -21,7 +21,7 @@ Based on KonqCombo */ class KLSHistoryCombo : public KHistoryCombo { - Q_OBJECT + TQ_OBJECT public: diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp index 3b6e6603..adea6013 100644 --- a/klinkstatus/src/ui/resultssearchbar.cpp +++ b/klinkstatus/src/ui/resultssearchbar.cpp @@ -73,8 +73,8 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name) d->layout->addWidget(searchLabel); d->searchLine = new KLineEdit(this, "searchline"); - connect(d->searchLine, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotSearchStringChanged(const TQString &))); + connect(d->searchLine, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotSearchStringChanged(const TQString &))); searchLabel->setBuddy(d->searchLine); d->layout->addWidget(d->searchLine); @@ -101,13 +101,13 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name) TQToolTip::add( d->searchLine, i18n("Enter the terms to filter the result link list")); TQToolTip::add( d->searchCombo, i18n("Choose what kind of link status to show in result list")); - connect(clearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT(slotClearSearch()) ); + connect(clearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT(slotClearSearch()) ); - connect(d->searchCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSearchComboChanged(int))); + connect(d->searchCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSearchComboChanged(int))); - connect(&(d->timer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotActivateSearch())); + connect(&(d->timer), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotActivateSearch())); } ResultsSearchBar::~ResultsSearchBar() diff --git a/klinkstatus/src/ui/resultssearchbar.h b/klinkstatus/src/ui/resultssearchbar.h index 1c5854c9..a9edceee 100644 --- a/klinkstatus/src/ui/resultssearchbar.h +++ b/klinkstatus/src/ui/resultssearchbar.h @@ -32,7 +32,7 @@ */ class ResultsSearchBar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ResultsSearchBar(TQWidget *parent = 0, const char *name = 0); diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index a3dc0e25..b1072add 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -81,13 +81,13 @@ SessionWidget::SessionWidget(int max_simultaneous_connections, int time_out, init(); slotLoadSettings(); - connect(combobox_url, TQT_SIGNAL( textChanged ( const TQString & ) ), - this, TQT_SLOT( slotEnableCheckButton( const TQString & ) ) ); + connect(combobox_url, TQ_SIGNAL( textChanged ( const TQString & ) ), + this, TQ_SLOT( slotEnableCheckButton( const TQString & ) ) ); - connect(tree_view, TQT_SIGNAL( clicked ( TQListViewItem * ) ), - this, TQT_SLOT( showBottomStatusLabel( TQListViewItem * ) ) ); + connect(tree_view, TQ_SIGNAL( clicked ( TQListViewItem * ) ), + this, TQ_SLOT( showBottomStatusLabel( TQListViewItem * ) ) ); - connect(&bottom_status_timer_, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearBottomStatusLabel()) ); + connect(&bottom_status_timer_, TQ_SIGNAL(timeout()), this, TQ_SLOT(clearBottomStatusLabel()) ); } SessionWidget::~SessionWidget() @@ -107,14 +107,14 @@ void SessionWidget::init() pushbutton_url->setIconSet(TDEGlobal::iconLoader()->loadIconSet("document-open", TDEIcon::Small)); TQPixmap pixMap = TDEGlobal::iconLoader()->loadIcon("document-open", TDEIcon::Small); pushbutton_url->setFixedSize(pixMap.width() + 8, pixMap.height() + 8); - connect(pushbutton_url, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChooseUrlDialog())); + connect(pushbutton_url, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChooseUrlDialog())); resultsSearchBar->hide(); start_search_action_ = static_cast<TDEToggleAction*> (action_manager_->action("start_search")); - connect(resultsSearchBar, TQT_SIGNAL(signalSearch(LinkMatcher)), - this, TQT_SLOT(slotApplyFilter(LinkMatcher))); + connect(resultsSearchBar, TQ_SIGNAL(signalSearch(LinkMatcher)), + this, TQ_SLOT(slotApplyFilter(LinkMatcher))); } void SessionWidget::slotLoadSettings(bool modify_current_widget_settings) @@ -151,23 +151,23 @@ void SessionWidget::newSearchManager() search_manager_ = new SearchManager(KLSConfig::maxConnectionsNumber(), KLSConfig::timeOut(), - TQT_TQOBJECT(this), "search_manager"); + this, "search_manager"); Q_ASSERT(search_manager_); - connect(search_manager_, TQT_SIGNAL(signalRootChecked(const LinkStatus *, LinkChecker *)), - this, TQT_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *))); - connect(search_manager_, TQT_SIGNAL(signalLinkChecked(const LinkStatus *, LinkChecker *)), - this, TQT_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *))); - connect(search_manager_, TQT_SIGNAL(signalSearchFinished()), - this, TQT_SLOT(slotSearchFinished())); - connect(search_manager_, TQT_SIGNAL(signalSearchPaused()), - this, TQT_SLOT(slotSearchPaused())); - connect(search_manager_, TQT_SIGNAL(signalAddingLevelTotalSteps(uint)), - this, TQT_SLOT(slotAddingLevelTotalSteps(uint))); - connect(search_manager_, TQT_SIGNAL(signalAddingLevelProgress()), - this, TQT_SLOT(slotAddingLevelProgress())); - connect(search_manager_, TQT_SIGNAL(signalLinksToCheckTotalSteps(uint)), - this, TQT_SLOT(slotLinksToCheckTotalSteps(uint))); + connect(search_manager_, TQ_SIGNAL(signalRootChecked(const LinkStatus *, LinkChecker *)), + this, TQ_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *))); + connect(search_manager_, TQ_SIGNAL(signalLinkChecked(const LinkStatus *, LinkChecker *)), + this, TQ_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *))); + connect(search_manager_, TQ_SIGNAL(signalSearchFinished()), + this, TQ_SLOT(slotSearchFinished())); + connect(search_manager_, TQ_SIGNAL(signalSearchPaused()), + this, TQ_SLOT(slotSearchPaused())); + connect(search_manager_, TQ_SIGNAL(signalAddingLevelTotalSteps(uint)), + this, TQ_SLOT(slotAddingLevelTotalSteps(uint))); + connect(search_manager_, TQ_SIGNAL(signalAddingLevelProgress()), + this, TQ_SLOT(slotAddingLevelProgress())); + connect(search_manager_, TQ_SIGNAL(signalLinksToCheckTotalSteps(uint)), + this, TQ_SLOT(slotLinksToCheckTotalSteps(uint))); } void SessionWidget::setColumns(TQStringList const& colunas) diff --git a/klinkstatus/src/ui/sessionwidget.h b/klinkstatus/src/ui/sessionwidget.h index 057b2c6c..fece4492 100644 --- a/klinkstatus/src/ui/sessionwidget.h +++ b/klinkstatus/src/ui/sessionwidget.h @@ -44,7 +44,7 @@ using namespace std; class SessionWidget: public SessionWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/klinkstatus/src/ui/sessionwidgetbase.ui b/klinkstatus/src/ui/sessionwidgetbase.ui index 53cdd510..c5c2acaf 100644 --- a/klinkstatus/src/ui/sessionwidgetbase.ui +++ b/klinkstatus/src/ui/sessionwidgetbase.ui @@ -585,18 +585,18 @@ <tabstop>checkbox_subdirs_only</tabstop> <tabstop>checkbox_external_links</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot specifier="pure virtual">slotCheck()</slot> <slot specifier="pure virtual">slotCancel()</slot> <slot specifier="pure virtual">slotClearComboUrl()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klshistorycombo.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>resultssearchbar.h</includehint> - <includehint>treeview.h</includehint> - <includehint>kprogress.h</includehint> - <includehint>ksqueezedtextlabel.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klshistorycombo.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">resultssearchbar.h</include> + <include location="global" impldecl="in implementation">treeview.h</include> + <include location="global" impldecl="in implementation">kprogress.h</include> + <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include> +</includes> </UI> diff --git a/klinkstatus/src/ui/settings/CMakeLists.txt b/klinkstatus/src/ui/settings/CMakeLists.txt new file mode 100644 index 00000000..932c0cdd --- /dev/null +++ b/klinkstatus/src/ui/settings/CMakeLists.txt @@ -0,0 +1,35 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/klinkstatus/src/cfg + ${CMAKE_BINARY_DIR}/klinkstatus/src +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### settings (static) + +tde_add_library( settings STATIC_PIC AUTOMOC + + SOURCES + ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp + configsearchdialog.ui + configresultsdialog.ui + configidentificationdialogui.ui + configidentificationdialog.cpp + + DEPENDENCIES + cfg-static +) + +configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY ) diff --git a/klinkstatus/src/ui/settings/Makefile.am b/klinkstatus/src/ui/settings/Makefile.am index 777e9e5c..07fcba6c 100644 --- a/klinkstatus/src/ui/settings/Makefile.am +++ b/klinkstatus/src/ui/settings/Makefile.am @@ -2,6 +2,10 @@ INCLUDES = -I$(top_builddir)/klinkstatus/src/cfg -I$(top_builddir)/klinkstatus/s METASOURCES = AUTO libsettings_la_LDFLAGS = $(all_libraries) noinst_LTLIBRARIES = libsettings.la +CLEANFILES = dummy.cpp libsettings_la_SOURCES = configsearchdialog.ui dummy.cpp configresultsdialog.ui \ configidentificationdialog.cpp configidentificationdialogui.ui noinst_HEADERS = configidentificationdialog.h + +dummy.cpp: + echo > dummy.cpp diff --git a/klinkstatus/src/ui/settings/configidentificationdialog.cpp b/klinkstatus/src/ui/settings/configidentificationdialog.cpp index 31906ace..b7d7800f 100644 --- a/klinkstatus/src/ui/settings/configidentificationdialog.cpp +++ b/klinkstatus/src/ui/settings/configidentificationdialog.cpp @@ -37,7 +37,7 @@ ConfigIdentificationDialog::ConfigIdentificationDialog(TQWidget *parent, const c slotDefaultUA(); } - connect(buttonDefault, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefaultUA())); + connect(buttonDefault, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDefaultUA())); } diff --git a/klinkstatus/src/ui/settings/configidentificationdialog.h b/klinkstatus/src/ui/settings/configidentificationdialog.h index b9a40fd3..307187b4 100644 --- a/klinkstatus/src/ui/settings/configidentificationdialog.h +++ b/klinkstatus/src/ui/settings/configidentificationdialog.h @@ -28,7 +28,7 @@ */ class ConfigIdentificationDialog : public ConfigIdentificationDialogUi { -Q_OBJECT +TQ_OBJECT public: ConfigIdentificationDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/klinkstatus/src/ui/settings/configidentificationdialogui.ui b/klinkstatus/src/ui/settings/configidentificationdialogui.ui index 87b73fbf..8b30ed58 100644 --- a/klinkstatus/src/ui/settings/configidentificationdialogui.ui +++ b/klinkstatus/src/ui/settings/configidentificationdialogui.ui @@ -127,8 +127,8 @@ <tabstop>buttonDefault</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/klinkstatus/src/ui/settings/configsearchdialog.ui b/klinkstatus/src/ui/settings/configsearchdialog.ui index 72c420ca..097c08fc 100644 --- a/klinkstatus/src/ui/settings/configsearchdialog.ui +++ b/klinkstatus/src/ui/settings/configsearchdialog.ui @@ -344,10 +344,7 @@ <tabstop>kcfg_RememberCheckSettings</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/klinkstatus/src/ui/settings/dummy.cpp b/klinkstatus/src/ui/settings/dummy.cpp deleted file mode 100644 index e69de29b..00000000 --- a/klinkstatus/src/ui/settings/dummy.cpp +++ /dev/null diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp index 4a886e1d..28ac2aa0 100644 --- a/klinkstatus/src/ui/tablelinkstatus.cpp +++ b/klinkstatus/src/ui/tablelinkstatus.cpp @@ -67,8 +67,8 @@ TableLinkstatus::TableLinkstatus(TQWidget * parent, const char * name, sub_menu_ = new TQPopupMenu(this, "sub_menu_referrers"); - connect(this, TQT_SIGNAL( contextMenuRequested ( int, int, const TQPoint& )), - this, TQT_SLOT( slotPopupContextMenu( int, int, const TQPoint&)) ); + connect(this, TQ_SIGNAL( contextMenuRequested ( int, int, const TQPoint& )), + this, TQ_SLOT( slotPopupContextMenu( int, int, const TQPoint&)) ); } TableLinkstatus::~TableLinkstatus() @@ -274,14 +274,14 @@ void TableLinkstatus::loadContextTableMenu(TQValueVector<KURL> const& referrers, if(!is_root) { - sub_menu_->insertItem(i18n("All"), this, TQT_SLOT(slotEditReferrersWithQuanta())); + sub_menu_->insertItem(i18n("All"), this, TQ_SLOT(slotEditReferrersWithQuanta())); sub_menu_->insertSeparator(); for(uint i = 0; i != referrers.size(); ++i) { sub_menu_->insertItem(referrers[i].prettyURL()); } - connect(sub_menu_, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotEditReferrerWithQuanta(int))); + connect(sub_menu_, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotEditReferrerWithQuanta(int))); context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Edit Referrer with Quanta"), sub_menu_); @@ -293,21 +293,21 @@ void TableLinkstatus::loadContextTableMenu(TQValueVector<KURL> const& referrers, } context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Open URL"), - this, TQT_SLOT(slotViewUrlInBrowser())); + this, TQ_SLOT(slotViewUrlInBrowser())); context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Open Referrer URL"), - this, TQT_SLOT(slotViewParentUrlInBrowser())); + this, TQ_SLOT(slotViewParentUrlInBrowser())); context_table_menu_.insertSeparator(); context_table_menu_.insertItem(SmallIconSet("edit-copy"), i18n("Copy URL"), - this, TQT_SLOT(slotCopyUrlToClipboard())); + this, TQ_SLOT(slotCopyUrlToClipboard())); context_table_menu_.insertItem(SmallIconSet("edit-copy"), i18n("Copy Referrer URL"), - this, TQT_SLOT(slotCopyParentUrlToClipboard())); + this, TQ_SLOT(slotCopyParentUrlToClipboard())); context_table_menu_.insertItem(SmallIconSet("edit-copy"), i18n("Copy Cell Text"), - this, TQT_SLOT(slotCopyCellTextToClipboard())); + this, TQ_SLOT(slotCopyCellTextToClipboard())); } void TableLinkstatus::slotCopyUrlToClipboard() const diff --git a/klinkstatus/src/ui/tablelinkstatus.h b/klinkstatus/src/ui/tablelinkstatus.h index ba7d9731..0d01da82 100644 --- a/klinkstatus/src/ui/tablelinkstatus.h +++ b/klinkstatus/src/ui/tablelinkstatus.h @@ -45,7 +45,7 @@ class TableItem; class TableLinkstatus: public TQTable, public ResultView { - Q_OBJECT + TQ_OBJECT public: diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp index 015ce4cf..e2f6a54f 100644 --- a/klinkstatus/src/ui/tabwidgetsession.cpp +++ b/klinkstatus/src/ui/tabwidgetsession.cpp @@ -45,7 +45,7 @@ TabWidgetSession::TabWidgetSession(TQWidget* parent, const char* name, WFlags f) : KTabWidget(parent, name, f) // tabs_ is initialized with size 17 { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setMargin(0); setTabReorderingEnabled(true); setHoverCloseButton(true); @@ -55,7 +55,7 @@ TabWidgetSession::TabWidgetSession(TQWidget* parent, const char* name, WFlags f) TQToolButton* tabs_new = new TQToolButton(this); tabs_new->setAccel(TQKeySequence("Ctrl+N")); - connect(tabs_new, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewSession())); + connect(tabs_new, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewSession())); tabs_new->setIconSet(SmallIconSet("tab_new_raised")); tabs_new->adjustSize(); TQToolTip::add(tabs_new, i18n("Open new tab")); @@ -63,13 +63,13 @@ TabWidgetSession::TabWidgetSession(TQWidget* parent, const char* name, WFlags f) tabs_close_ = new TQToolButton(this); tabs_close_->setAccel(TQKeySequence("Ctrl+W")); - connect(tabs_close_, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeSession())); + connect(tabs_close_, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeSession())); tabs_close_->setIconSet(SmallIconSet("tab_remove")); tabs_close_->adjustSize(); TQToolTip::add(tabs_close_, i18n("Close the current tab")); setCornerWidget(tabs_close_, TopRight); - connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotCurrentChanged(TQWidget*))); } TabWidgetSession::~TabWidgetSession() @@ -117,8 +117,8 @@ SessionWidget* TabWidgetSession::newSession() { // TODO: settings: number of connections, timeout SessionWidget* session_widget = newSessionWidget(); - connect(session_widget, TQT_SIGNAL(signalUpdateTabLabel(const LinkStatus *, SessionWidget*)), - this, TQT_SLOT(updateTabLabel(const LinkStatus *, SessionWidget*))); + connect(session_widget, TQ_SIGNAL(signalUpdateTabLabel(const LinkStatus *, SessionWidget*)), + this, TQ_SLOT(updateTabLabel(const LinkStatus *, SessionWidget*))); insertTab(session_widget, i18n("Session") + i18n(TQString::number(count() + 1).ascii())); @@ -149,7 +149,7 @@ void TabWidgetSession::closeSession() SessionWidget* TabWidgetSession::newSessionWidget() { SessionWidget* session_widget = new SessionWidget(KLSConfig::maxConnectionsNumber(), - KLSConfig::timeOut(), this, TQString("session_widget-" + count())); + KLSConfig::timeOut(), this, TQString("session_widget-" + count()).utf8()); TQStringList columns; diff --git a/klinkstatus/src/ui/tabwidgetsession.h b/klinkstatus/src/ui/tabwidgetsession.h index 22675a38..a58e413f 100644 --- a/klinkstatus/src/ui/tabwidgetsession.h +++ b/klinkstatus/src/ui/tabwidgetsession.h @@ -37,7 +37,7 @@ This class handles the creation and destruction of sessions, i.e, severals insta */ class TabWidgetSession : public KTabWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp index c14a0824..c0cebe68 100644 --- a/klinkstatus/src/ui/treeview.cpp +++ b/klinkstatus/src/ui/treeview.cpp @@ -54,8 +54,8 @@ TreeView::TreeView(TQWidget *parent, const char *name) sub_menu_ = new TQPopupMenu(this, "sub_menu_referrers"); - connect(this, TQT_SIGNAL( rightButtonClicked ( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT( slotPopupContextMenu( TQListViewItem *, const TQPoint &, int )) ); + connect(this, TQ_SIGNAL( rightButtonClicked ( TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT( slotPopupContextMenu( TQListViewItem *, const TQPoint &, int )) ); } @@ -72,7 +72,7 @@ void TreeView::setColumns(TQStringList const& columns) // resetColumns is called automatically for(uint i = 0; i != columns.size(); ++i) { - addColumn(i18n(columns[i])); + addColumn(i18n(columns[i].utf8())); setColumnWidthMode(i, TQListView::Manual); } @@ -345,14 +345,14 @@ void TreeView::loadContextTableMenu(TQValueVector<KURL> const& referrers, bool i if(!is_root) { - sub_menu_->insertItem(i18n("All"), this, TQT_SLOT(slotEditReferrersWithQuanta())); + sub_menu_->insertItem(i18n("All"), this, TQ_SLOT(slotEditReferrersWithQuanta())); sub_menu_->insertSeparator(); for(uint i = 0; i != referrers.size(); ++i) { sub_menu_->insertItem(referrers[i].prettyURL()); } - connect(sub_menu_, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotEditReferrerWithQuanta(int))); + connect(sub_menu_, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotEditReferrerWithQuanta(int))); context_table_menu_.insertItem(SmallIconSet("edit"), i18n("Edit Referrer with Quanta"), sub_menu_); @@ -365,21 +365,21 @@ void TreeView::loadContextTableMenu(TQValueVector<KURL> const& referrers, bool i } context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Open URL"), - this, TQT_SLOT(slotViewUrlInBrowser())); + this, TQ_SLOT(slotViewUrlInBrowser())); context_table_menu_.insertItem(/*SmallIconSet("document-open"), */i18n("Open Referrer URL"), - this, TQT_SLOT(slotViewParentUrlInBrowser())); + this, TQ_SLOT(slotViewParentUrlInBrowser())); context_table_menu_.insertSeparator(); context_table_menu_.insertItem(SmallIconSet("edit-copy"), i18n("Copy URL"), - this, TQT_SLOT(slotCopyUrlToClipboard())); + this, TQ_SLOT(slotCopyUrlToClipboard())); context_table_menu_.insertItem(/*SmallIconSet("edit-copy"), */i18n("Copy Referrer URL"), - this, TQT_SLOT(slotCopyParentUrlToClipboard())); + this, TQ_SLOT(slotCopyParentUrlToClipboard())); context_table_menu_.insertItem(/*SmallIconSet("edit-copy"), */i18n("Copy Cell Text"), - this, TQT_SLOT(slotCopyCellTextToClipboard())); + this, TQ_SLOT(slotCopyCellTextToClipboard())); } TreeViewItem* TreeView::myItem(TQListViewItem* item) const diff --git a/klinkstatus/src/ui/treeview.h b/klinkstatus/src/ui/treeview.h index 3ce26039..b3d6b9ee 100644 --- a/klinkstatus/src/ui/treeview.h +++ b/klinkstatus/src/ui/treeview.h @@ -28,7 +28,7 @@ that a TQTable view isn't needed at all so some day I will clean this up. */ class TreeView : public TDEListView, public ResultView { - Q_OBJECT + TQ_OBJECT public: diff --git a/klinkstatus/src/utils/CMakeLists.txt b/klinkstatus/src/utils/CMakeLists.txt new file mode 100644 index 00000000..53a5fc3d --- /dev/null +++ b/klinkstatus/src/utils/CMakeLists.txt @@ -0,0 +1,32 @@ +add_compile_options( ${ICU_CXXFLAGS} ) + + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${LIBXML_INCLUDE_DIRS} + ${LIBXSLT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### utils (static) + +tde_add_library( utils STATIC_PIC AUTOMOC + + SOURCES + utils.cpp + xsl.cpp + LINK + ${LIBXSLT_LIBRARIES} +) diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp index 12ab5cee..69366c5f 100644 --- a/klinkstatus/src/utils/xsl.cpp +++ b/klinkstatus/src/utils/xsl.cpp @@ -432,6 +432,3 @@ unsigned int XSLT::flags() const } #include "xsl.moc" - -// vim: set noet ts=4 sts=4 sw=4: - diff --git a/klinkstatus/src/utils/xsl.h b/klinkstatus/src/utils/xsl.h index 4e6d8476..e579968b 100644 --- a/klinkstatus/src/utils/xsl.h +++ b/klinkstatus/src/utils/xsl.h @@ -34,7 +34,7 @@ class XSLTPrivate; */ class XSLT : public TQObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( Flags flags READ flagsProperty WRITE setFlagsProperty ) |
