From 46224eafb01bb59158b4c89fbfb9b9ca53d228a0 Mon Sep 17 00:00:00 2001 From: samelian Date: Sun, 18 Sep 2011 09:00:20 +0000 Subject: [kdenetwork/ksirc] added cmake support git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1254232 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- CMakeLists.txt | 2 ++ ksirc/CMakeLists.txt | 72 ++++++++++++++++++++++++++++++++++++++ ksirc/KSOpenkSirc/CMakeLists.txt | 30 ++++++++++++++++ ksirc/KSOpenkSirc/open_ksirc.cpp | 14 ++++---- ksirc/KSPrefs/CMakeLists.txt | 31 ++++++++++++++++ ksirc/KSProgress/CMakeLists.txt | 26 ++++++++++++++ ksirc/KSTicker/CMakeLists.txt | 24 +++++++++++++ ksirc/icons/CMakeLists.txt | 13 +++++++ ksirc/img/CMakeLists.txt | 22 ++++++++++++ ksirc/img/emoticons/CMakeLists.txt | 16 +++++++++ 10 files changed, 243 insertions(+), 7 deletions(-) create mode 100644 ksirc/CMakeLists.txt create mode 100644 ksirc/KSOpenkSirc/CMakeLists.txt create mode 100644 ksirc/KSPrefs/CMakeLists.txt create mode 100644 ksirc/KSProgress/CMakeLists.txt create mode 100644 ksirc/KSTicker/CMakeLists.txt create mode 100644 ksirc/icons/CMakeLists.txt create mode 100644 ksirc/img/CMakeLists.txt create mode 100644 ksirc/img/emoticons/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index aa8e48c8..37659289 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,6 +103,7 @@ option( BUILD_KPF "Build kpf" ${BUILD_ALL} ) option( BUILD_KPPP "Build kppp" ${BUILD_ALL} ) option( BUILD_KRDC "Build krdc" ${BUILD_ALL} ) option( BUILD_KRFB "Build krfb" ${BUILD_ALL} ) +option( BUILD_KSIRC "Build ksirc" ${BUILD_ALL} ) option( BUILD_LIBRSS "Build librss" ${BUILD_ALL} ) @@ -137,6 +138,7 @@ tde_conditional_add_subdirectory( BUILD_KPF kpf ) tde_conditional_add_subdirectory( BUILD_KPPP kppp ) tde_conditional_add_subdirectory( BUILD_KRDC krdc ) tde_conditional_add_subdirectory( BUILD_KRFB krfb ) +tde_conditional_add_subdirectory( BUILD_KSIRC ksirc ) tde_conditional_add_subdirectory( BUILD_LIBRSS librss ) diff --git a/ksirc/CMakeLists.txt b/ksirc/CMakeLists.txt new file mode 100644 index 00000000..c3b9c488 --- /dev/null +++ b/ksirc/CMakeLists.txt @@ -0,0 +1,72 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +# FIXME KDE_CXXFLAGS = $(USE_RTTI) $(USE_EXCEPTIONS) + +add_subdirectory( KSTicker ) +add_subdirectory( KSProgress ) +add_subdirectory( KSPrefs ) +add_subdirectory( KSOpenkSirc ) +add_subdirectory( img ) +add_subdirectory( icons ) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/KSOpenkSirc + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +install( PROGRAMS + dsirc + DESTINATION ${BIN_INSTALL_DIR} ) + +install( FILES + ksirc.pl filters.pl autodcc.pl sirc.help.gz relnotes eventsrc + DESTINATION ${DATA_INSTALL_DIR}/ksirc ) + +install( FILES + ksircrc + DESTINATION ${CONFIG_INSTALL_DIR} ) + +install( FILES + ksirc.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} ) + + +##### ksirc (kdeinit) ########################### + +tde_add_kdeinit_executable( ksirc AUTOMOC + SOURCES + toplevel.cpp charSelector.cpp chanButtons.cpp ksirc.cpp alistbox.cpp + ahistlineedit.cpp iocontroller.cpp NewWindowDialog.cpp + messageReceiver.cpp ioBroadcast.cpp ksircprocess.cpp + servercontroller.cpp FilterRuleWidget.ui FilterRuleEditor.cpp + ioDiscard.cpp ioDCC.cpp ioLAG.cpp ioNotify.cpp ssfeprompt.cpp + ssfepromptdata.cpp usercontrolmenu.cpp baserules.cpp chanparser.cpp + objFinder.cpp displayMgrSDI.cpp displayMgrMDI.cpp mditoplevel.cpp + ksopts.cpp topic.cpp ksview.cpp logfile.cpp kstextview.cpp + colorpicker.cpp ksparser.cpp dccManagerbase.ui dccManager.cpp + dccToplevel.cpp dockservercontroller.cpp nickColourMaker.cpp + dccNewbase.ui dccNew.cpp + LINK + ksprefs-static ksprogress-static ksopenksirc-static ksticker-static + kio-shared +) diff --git a/ksirc/KSOpenkSirc/CMakeLists.txt b/ksirc/KSOpenkSirc/CMakeLists.txt new file mode 100644 index 00000000..0d8387b2 --- /dev/null +++ b/ksirc/KSOpenkSirc/CMakeLists.txt @@ -0,0 +1,30 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + + +##### other data ################################ + +install( FILES servers.txt servers.ini DESTINATION ${DATA_INSTALL_DIR}/ksirc ) + + +##### ksopenksirc (static) ###################### + +tde_add_library( ksopenksirc STATIC_PIC AUTOMOC + SOURCES + open_ksirc.cpp open_ksircData.ui serverFileParser.cpp enter_combo.cpp +) diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp index b41373c5..3b96df99 100644 --- a/ksirc/KSOpenkSirc/open_ksirc.cpp +++ b/ksirc/KSOpenkSirc/open_ksirc.cpp @@ -48,7 +48,7 @@ open_ksirc::open_ksirc // changes are written to ~/.kde/share/apps/ksirc/servers.txt TQString filename = locate("appdata", "servers.txt"); - serverFileParser::readDatafile( filename ); + serverFileParser::readDatafile( filename.ascii() ); Groups.setAutoDelete(TRUE); @@ -137,8 +137,8 @@ void open_ksirc::insertGroupList() Server *serv; for ( serv=Groups.first(); serv != 0; serv=Groups.next() ) { - if (tempgroups.find(serv->group()) == -1) - tempgroups.inSort( serv->group() ); + if (tempgroups.find(serv->group().ascii()) == -1) + tempgroups.inSort( serv->group().ascii() ); } ComboB_ServerGroup->insertItem(i18n( "Recent") ); @@ -158,7 +158,7 @@ void open_ksirc::insertServerList( const char * group ) Server *serv; for ( serv=Groups.first(); serv != 0; serv=Groups.next() ) { - if ( !qstrcmp(serv->group(), group) ) { + if ( !qstrcmp(serv->group().ascii(), group) ) { newListBox->insertItem( serv->server(), 0 ); } } @@ -188,7 +188,7 @@ void open_ksirc::setServer( const TQString &serveraddress ) portlist = serv->ports(); for ( p=portlist.last(); p != 0; p=portlist.prev() ) { newListBox->insertItem( p->portnum() ); - if (strcmp(p->portnum(), "6667") == 0) + if (strcmp(p->portnum().ascii(), "6667") == 0) defaultport = TRUE; } LineE_Password->setText( serv->password() ); @@ -249,7 +249,7 @@ TQString open_ksirc::decryptPassword( const TQString &scrambled ) void open_ksirc::setGroup( const TQString &group ) { - insertServerList( group ); + insertServerList( group.ascii() ); if (ComboB_ServerName->count() > 0) { TQString blah = TQString(ComboB_ServerName->text( 0 )); setServer(blah); @@ -284,7 +284,7 @@ void open_ksirc::clickConnect() port = ComboB_ServerPort->currentText(); for ( serv=Groups.first(); serv != 0; serv=Groups.next() ) { - if (strcmp(serv->server(), server) == 0) { + if (strcmp(serv->server().ascii(), server.ascii()) == 0) { script = serv->script(); } break; diff --git a/ksirc/KSPrefs/CMakeLists.txt b/ksirc/KSPrefs/CMakeLists.txt new file mode 100644 index 00000000..8eda71c8 --- /dev/null +++ b/ksirc/KSPrefs/CMakeLists.txt @@ -0,0 +1,31 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + + +##### ksprefs (static) ########################## + +tde_add_library( ksprefs STATIC_PIC AUTOMOC + SOURCES + ksprefs.cpp page_colorsbase.ui page_generalbase.ui + page_rmbmenubase.ui page_servchanbase.ui page_startupbase.ui + page_colors.cpp page_general.cpp page_rmbmenu.cpp page_servchan.cpp + page_startup.cpp page_font.cpp page_autoconnectbase.ui + page_autoconnect.cpp page_irccolorsbase.ui page_irccolors.cpp + page_looknfeelbase.ui page_looknfeel.cpp page_shortcutsbase.ui + page_shortcuts.cpp +) diff --git a/ksirc/KSProgress/CMakeLists.txt b/ksirc/KSProgress/CMakeLists.txt new file mode 100644 index 00000000..bb4491c5 --- /dev/null +++ b/ksirc/KSProgress/CMakeLists.txt @@ -0,0 +1,26 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +# FIXME KDE_CXXFLAGS = $(USE_RTTI) $(USE_EXCEPTIONS) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + + +##### ksprogress (static) ####################### + +tde_add_library( ksprogress STATIC_PIC AUTOMOC + SOURCES + ksprogress.cpp ksprogressdata.cpp +) diff --git a/ksirc/KSTicker/CMakeLists.txt b/ksirc/KSTicker/CMakeLists.txt new file mode 100644 index 00000000..b569747c --- /dev/null +++ b/ksirc/KSTicker/CMakeLists.txt @@ -0,0 +1,24 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + + +##### ksticker (static) ######################### + +tde_add_library( ksticker STATIC_PIC AUTOMOC + SOURCES + ksticker.cpp speeddialog.cpp speeddialogData.cpp kspainter.cpp +) diff --git a/ksirc/icons/CMakeLists.txt b/ksirc/icons/CMakeLists.txt new file mode 100644 index 00000000..2710aa6d --- /dev/null +++ b/ksirc/icons/CMakeLists.txt @@ -0,0 +1,13 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/ksirc/icons ) +tde_install_icons( ksirc ) diff --git a/ksirc/img/CMakeLists.txt b/ksirc/img/CMakeLists.txt new file mode 100644 index 00000000..018ceae5 --- /dev/null +++ b/ksirc/img/CMakeLists.txt @@ -0,0 +1,22 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( emoticons ) + +install( FILES + server.xpm channel.xpm channels.xpm ksirc_a.xpm ksirc_b.xpm + arrow.png greenpin.png madsmiley.png smiley.png sadsmiley.png + blueball.png star.png bluepin.png info.png info1.png mini-run.png + ksirc.png sdi.png mdi.png dcc.png kick.png mode.png quit.png X.png + dccget.png minus.png notice.png servinfo.png action.png dccsend.png + ominus.png topic.png bminus.png elipsis.png oplus.png bplus.png + error.png part.png ctcpping.png join.png plus.png + DESTINATION ${DATA_INSTALL_DIR}/ksirc/pics ) diff --git a/ksirc/img/emoticons/CMakeLists.txt b/ksirc/img/emoticons/CMakeLists.txt new file mode 100644 index 00000000..f36e67ef --- /dev/null +++ b/ksirc/img/emoticons/CMakeLists.txt @@ -0,0 +1,16 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +install( FILES + biggrin.png clown.png cry.png devil.png frown.png heart.png + loveit.png puh.png puh2.png redface.png sadley.png slime.png + smile.png wink.png yummie.png + DESTINATION ${DATA_INSTALL_DIR}/ksirc/pics/emoticons ) -- cgit v1.2.3