2 files changed, 37 insertions, 7 deletions

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;