From 63c7b752146a799925d8e2669aa3ee40a04754c8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 16:17:04 -0600 Subject: [PATCH] Fix FTBFS resulting from KCModule rename --- systemsettings/HACKING | 2 +- systemsettings/Makefile.am | 4 ++-- systemsettings/kcmsearch.h | 2 +- systemsettings/kcmultiwidget.cpp | 4 ++-- systemsettings/mainwindow.cpp | 6 +++--- systemsettings/mainwindow.h | 4 ++-- systemsettings/moduleiconitem.h | 2 +- systemsettings/modulesview.cpp | 2 +- systemsettings/{kcmodulemenu.cpp => tdecmodulemenu.cpp} | 4 ++-- systemsettings/{kcmodulemenu.h => tdecmodulemenu.h} | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) rename systemsettings/{kcmodulemenu.cpp => tdecmodulemenu.cpp} (98%) rename systemsettings/{kcmodulemenu.h => tdecmodulemenu.h} (97%) diff --git a/systemsettings/HACKING b/systemsettings/HACKING index 45d9449..6c7a9b6 100644 --- a/systemsettings/HACKING +++ b/systemsettings/HACKING @@ -9,7 +9,7 @@ kcmsearch - Search widget that can search ModulesView and enable/disable items. modulesiconitem - The individual modules items. Used for loading enabled/disabled images and storing the list of modules acosiated with the item. -kcmodulemenu - Class that reads in a freedesktop.org .menu file into a QValueList. +tdecmodulemenu - Class that reads in a freedesktop.org .menu file into a QValueList. kcmultiwidget - A basterdized kcmultidialog from tdelibs/kutil that provides info about the current shown dialog so the about dialog and caption can be updated and prompts for unsaved changes. diff --git a/systemsettings/Makefile.am b/systemsettings/Makefile.am index 3a026f4..c1c58ca 100644 --- a/systemsettings/Makefile.am +++ b/systemsettings/Makefile.am @@ -23,9 +23,9 @@ SUBDIRS = . menu bin_PROGRAMS = systemsettings -systemsettings_SOURCES = kcmodulemenu.cpp kcmsearch.cpp kcmultiwidget.cpp main.cpp mainwindow.cpp moduleiconitem.cpp modulesview.cpp kcscrollview.cpp +systemsettings_SOURCES = tdecmodulemenu.cpp kcmsearch.cpp kcmultiwidget.cpp main.cpp mainwindow.cpp moduleiconitem.cpp modulesview.cpp kcscrollview.cpp -EXTRA_DIST = kcmodulemenu.h kcmultiwidget.h moduleiconitem.h version.h kcmsearch.h mainwindow.h modulesview.h kcscrollview.h +EXTRA_DIST = tdecmodulemenu.h kcmultiwidget.h moduleiconitem.h version.h kcmsearch.h mainwindow.h modulesview.h kcscrollview.h systemsettings_LDADD = $(LIB_TDEUI) $(LIB_KUTILS) systemsettings_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/systemsettings/kcmsearch.h b/systemsettings/kcmsearch.h index 970b52f..c4de5db 100644 --- a/systemsettings/kcmsearch.h +++ b/systemsettings/kcmsearch.h @@ -23,7 +23,7 @@ #define KCMSEARCH_H #include -#include "kcmodulemenu.h" +#include "tdecmodulemenu.h" class ModulesView; diff --git a/systemsettings/kcmultiwidget.cpp b/systemsettings/kcmultiwidget.cpp index 7c2eace..7c61cfe 100644 --- a/systemsettings/kcmultiwidget.cpp +++ b/systemsettings/kcmultiwidget.cpp @@ -38,8 +38,8 @@ #include #include -#include "kcmoduleloader.h" -#include "kcmoduleproxy.h" +#include "tdecmoduleloader.h" +#include "tdecmoduleproxy.h" #include "kcmultiwidget.h" /* diff --git a/systemsettings/mainwindow.cpp b/systemsettings/mainwindow.cpp index 941abde..563aeb4 100644 --- a/systemsettings/mainwindow.cpp +++ b/systemsettings/mainwindow.cpp @@ -32,13 +32,13 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include @@ -48,7 +48,7 @@ #include "kcmsearch.h" #include "modulesview.h" #include "moduleiconitem.h" -#include "kcmodulemenu.h" +#include "tdecmodulemenu.h" #include "kcmultiwidget.h" MainWindow::MainWindow(bool embed, const TQString & menuFile, diff --git a/systemsettings/mainwindow.h b/systemsettings/mainwindow.h index de7d2fb..d545e57 100644 --- a/systemsettings/mainwindow.h +++ b/systemsettings/mainwindow.h @@ -22,7 +22,7 @@ #define MAINWINDOW_H #include -#include +#include #include #include #include @@ -30,7 +30,7 @@ #include #include "kcscrollview.h" -#include "kcmodulemenu.h" +#include "tdecmodulemenu.h" class TQWidgetStack; class TQIconViewItem; diff --git a/systemsettings/moduleiconitem.h b/systemsettings/moduleiconitem.h index 99d16ec..721c4b5 100644 --- a/systemsettings/moduleiconitem.h +++ b/systemsettings/moduleiconitem.h @@ -23,7 +23,7 @@ #define MODULEICONITEM_H #include -#include +#include class ConfigModule; diff --git a/systemsettings/modulesview.cpp b/systemsettings/modulesview.cpp index 13384d8..326fa1a 100644 --- a/systemsettings/modulesview.cpp +++ b/systemsettings/modulesview.cpp @@ -35,7 +35,7 @@ #include "kcmsearch.h" #include "moduleiconitem.h" -#include "kcmodulemenu.h" +#include "tdecmodulemenu.h" ModulesView::ModulesView( TDECModuleMenu *rootMenu, const TQString &menuPath, TQWidget *parent, const char *name ) : TQWidget( parent, name ), rootMenu( NULL ) diff --git a/systemsettings/kcmodulemenu.cpp b/systemsettings/tdecmodulemenu.cpp similarity index 98% rename from systemsettings/kcmodulemenu.cpp rename to systemsettings/tdecmodulemenu.cpp index 24660d9..ad500f3 100644 --- a/systemsettings/kcmodulemenu.cpp +++ b/systemsettings/tdecmodulemenu.cpp @@ -1,5 +1,5 @@ /** - * Copyright (C) 2005 Benjamin C Meyer (ben+kcmodulemenu at meyerhome dot net) + * Copyright (C) 2005 Benjamin C Meyer (ben+tdecmodulemenu at meyerhome dot net) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include "kcmodulemenu.h" +#include "tdecmodulemenu.h" #include #include diff --git a/systemsettings/kcmodulemenu.h b/systemsettings/tdecmodulemenu.h similarity index 97% rename from systemsettings/kcmodulemenu.h rename to systemsettings/tdecmodulemenu.h index 7350b19..e025f8d 100644 --- a/systemsettings/kcmodulemenu.h +++ b/systemsettings/tdecmodulemenu.h @@ -1,5 +1,5 @@ /** - * Copyright (C) 2005 Benjamin C Meyer (ben+kcmodulemenu at meyerhome dot net) + * Copyright (C) 2005 Benjamin C Meyer (ben+tdecmodulemenu at meyerhome dot net) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -20,7 +20,7 @@ #ifndef KCMMODULEMENU_H #define KCMMODULEMENU_H -#include +#include class TDECModuleMenuPrivate;