Browse Source

Fix FTBFS resulting from KCModule rename

pull/1/head
Timothy Pearson 9 years ago
parent
commit
63c7b75214
  1. 2
      systemsettings/HACKING
  2. 4
      systemsettings/Makefile.am
  3. 2
      systemsettings/kcmsearch.h
  4. 4
      systemsettings/kcmultiwidget.cpp
  5. 6
      systemsettings/mainwindow.cpp
  6. 4
      systemsettings/mainwindow.h
  7. 2
      systemsettings/moduleiconitem.h
  8. 2
      systemsettings/modulesview.cpp
  9. 4
      systemsettings/tdecmodulemenu.cpp
  10. 4
      systemsettings/tdecmodulemenu.h

2
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.

4
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

2
systemsettings/kcmsearch.h

@ -23,7 +23,7 @@
#define KCMSEARCH_H
#include <kiconviewsearchline.h>
#include "kcmodulemenu.h"
#include "tdecmodulemenu.h"
class ModulesView;

4
systemsettings/kcmultiwidget.cpp

@ -38,8 +38,8 @@
#include <kstdguiitem.h>
#include <kuser.h>
#include "kcmoduleloader.h"
#include "kcmoduleproxy.h"
#include "tdecmoduleloader.h"
#include "tdecmoduleproxy.h"
#include "kcmultiwidget.h"
/*

6
systemsettings/mainwindow.cpp

@ -32,13 +32,13 @@
#include <tqwidgetstack.h>
#include <tqtimer.h>
#include <kiconloader.h>
#include <kcmoduleloader.h>
#include <tdecmoduleloader.h>
#include <kdialogbase.h>
#include <kiconviewsearchline.h>
#include <kapplication.h>
#include <kaboutapplication.h>
#include <kdebug.h>
#include <kcmoduleproxy.h>
#include <tdecmoduleproxy.h>
#include <kbugreport.h>
#include <kmenubar.h>
#include <kactionclasses.h>
@ -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,

4
systemsettings/mainwindow.h

@ -22,7 +22,7 @@
#define MAINWINDOW_H
#include <kmainwindow.h>
#include <kcmoduleinfo.h>
#include <tdecmoduleinfo.h>
#include <ktabwidget.h>
#include <tqptrdict.h>
#include <tqlabel.h>
@ -30,7 +30,7 @@
#include <kiconviewsearchline.h>
#include "kcscrollview.h"
#include "kcmodulemenu.h"
#include "tdecmodulemenu.h"
class TQWidgetStack;
class TQIconViewItem;

2
systemsettings/moduleiconitem.h

@ -23,7 +23,7 @@
#define MODULEICONITEM_H
#include <kiconview.h>
#include <kcmoduleinfo.h>
#include <tdecmoduleinfo.h>
class ConfigModule;

2
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 )

4
systemsettings/kcmodulemenu.cpp → 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 <kapplication.h>
#include <kservicegroup.h>

4
systemsettings/kcmodulemenu.h → 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 <kcmoduleinfo.h>
#include <tdecmoduleinfo.h>
class TDECModuleMenuPrivate;
Loading…
Cancel
Save