make it compile without deprecated methods

CMakeLists.txt

@@ -57,11 +57,13 @@ kde_enable_exceptions()
 remove_definitions(-DQT_NO_STL) 
 
 ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX KSIRK VERSION_HEADER ksirk_version.h)
-
+if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
+   add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
+   add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000)
+endif()
 add_subdirectory(ksirk)
 add_subdirectory(ksirkskineditor)
 add_subdirectory(doc)
-
 if (${ECM_VERSION} STRGREATER "5.58.0")
     install(FILES ksirk.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
 else()

ksirk/Jabber/privacylist.cpp

@@ -77,7 +77,7 @@ bool PrivacyList::moveItemUp(int index)
 		}
 		items_[index].setOrder(items_[index-1].order());
 		items_[index-1].setOrder(order);
-		items_.swap(index,index-1);
+		items_.swapItemsAt(index,index-1);
 		return true;
 	}
 	else {
@@ -95,7 +95,7 @@ bool PrivacyList::moveItemDown(int index)
 		}
 		items_[index].setOrder(items_[index+1].order());
 		items_[index+1].setOrder(order);
-		items_.swap(index,index+1);
+		items_.swapItemsAt(index,index+1);
 		return true;
 	}
 	else {

ksirk/main.cpp

@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
 
   if (app.isSessionRestored())
   {
-      RESTORE(Ksirk::KGameWindow);
+      kRestoreMainWindows<Ksirk::KGameWindow>();
   }
   else
   {

ksirkskineditor/main.cpp

@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
 
   if (app.isSessionRestored())
   {
-      RESTORE(KsirkSkinEditor::MainWindow);
+      kRestoreMainWindows<KsirkSkinEditor::MainWindow>();
   }
   else
   {