summaryrefslogtreecommitdiffstats
path: root/kcontrol/kcontrol
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/kcontrol')
-rw-r--r--kcontrol/kcontrol/aboutwidget.cpp2
-rw-r--r--kcontrol/kcontrol/aboutwidget.h2
-rw-r--r--kcontrol/kcontrol/dockcontainer.cpp8
-rw-r--r--kcontrol/kcontrol/dockcontainer.h4
-rw-r--r--kcontrol/kcontrol/global.cpp4
-rw-r--r--kcontrol/kcontrol/helpwidget.cpp4
-rw-r--r--kcontrol/kcontrol/helpwidget.h2
-rw-r--r--kcontrol/kcontrol/indexwidget.cpp2
-rw-r--r--kcontrol/kcontrol/indexwidget.h2
-rw-r--r--kcontrol/kcontrol/kcrootonly.cpp4
-rw-r--r--kcontrol/kcontrol/main.cpp12
-rw-r--r--kcontrol/kcontrol/moduleIface.cpp2
-rw-r--r--kcontrol/kcontrol/moduleiconview.cpp2
-rw-r--r--kcontrol/kcontrol/modulemenu.cpp4
-rw-r--r--kcontrol/kcontrol/modules.cpp22
-rw-r--r--kcontrol/kcontrol/moduletreeview.cpp14
-rw-r--r--kcontrol/kcontrol/moduletreeview.h4
-rw-r--r--kcontrol/kcontrol/proxywidget.cpp24
-rw-r--r--kcontrol/kcontrol/proxywidget.h2
-rw-r--r--kcontrol/kcontrol/searchwidget.cpp2
-rw-r--r--kcontrol/kcontrol/searchwidget.h2
-rw-r--r--kcontrol/kcontrol/toplevel.cpp24
22 files changed, 74 insertions, 74 deletions
diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp
index f25eae002..9c7d25898 100644
--- a/kcontrol/kcontrol/aboutwidget.cpp
+++ b/kcontrol/kcontrol/aboutwidget.cpp
@@ -82,7 +82,7 @@ AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* ca
// set qwhatsthis help
TQWhatsThis::add(this, i18n(intro_text));
_viewer = new KHTMLPart( this, "_viewer" );
- _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored );
+ _viewer->widget()->tqsetSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored );
connect( _viewer->browserExtension(),
TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) );
diff --git a/kcontrol/kcontrol/aboutwidget.h b/kcontrol/kcontrol/aboutwidget.h
index 595e394e7..37a9b8537 100644
--- a/kcontrol/kcontrol/aboutwidget.h
+++ b/kcontrol/kcontrol/aboutwidget.h
@@ -31,7 +31,7 @@ class ConfigModule;
class KHTMLPart;
class KURL;
-class AboutWidget : public QHBox
+class AboutWidget : public TQHBox
{
Q_OBJECT
diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp
index 598807a2d..9acab1129 100644
--- a/kcontrol/kcontrol/dockcontainer.cpp
+++ b/kcontrol/kcontrol/dockcontainer.cpp
@@ -39,7 +39,7 @@
#include "modules.h"
#include "proxywidget.h"
-class ModuleTitle : public QHBox
+class ModuleTitle : public TQHBox
{
public:
ModuleTitle( TQWidget *parent, const char *name=0 );
@@ -131,7 +131,7 @@ DockContainer::DockContainer(TQWidget *parent)
, _module(0L)
{
_busyw = new TQLabel(i18n("<big><b>Loading...</b></big>"), this);
- _busyw->setAlignment(AlignCenter);
+ _busyw->tqsetAlignment(AlignCenter);
_busyw->setTextFormat(RichText);
_busyw->setGeometry(0,0, width(), height());
addWidget( _busyw );
@@ -163,7 +163,7 @@ void DockContainer::setBaseWidget(TQWidget *widget)
ProxyWidget* DockContainer::loadModule( ConfigModule *module )
{
- TQApplication::setOverrideCursor( waitCursor );
+ TQApplication::setOverrideCursor( tqwaitCursor );
ProxyWidget *widget = _modulew->load( module );
@@ -221,7 +221,7 @@ i18n("There are unsaved changes in the active module.\n"
ProxyWidget *widget = loadModule( module );
- KCGlobal::repairAccels( topLevelWidget() );
+ KCGlobal::repairAccels( tqtopLevelWidget() );
return ( widget!=0 );
}
diff --git a/kcontrol/kcontrol/dockcontainer.h b/kcontrol/kcontrol/dockcontainer.h
index 9c1dfb88f..ea62495bd 100644
--- a/kcontrol/kcontrol/dockcontainer.h
+++ b/kcontrol/kcontrol/dockcontainer.h
@@ -28,7 +28,7 @@ class ModuleTitle;
class ProxyWidget;
class TQLabel;
-class ModuleWidget : public QVBox
+class ModuleWidget : public TQVBox
{
Q_OBJECT
@@ -46,7 +46,7 @@ class ModuleWidget : public QVBox
TQVBox *m_body;
};
-class DockContainer : public QWidgetStack
+class DockContainer : public TQWidgetStack
{
Q_OBJECT
diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp
index 0a409b7e0..ed892ac70 100644
--- a/kcontrol/kcontrol/global.cpp
+++ b/kcontrol/kcontrol/global.cpp
@@ -91,12 +91,12 @@ TQString KCGlobal::baseGroup()
if (_infocenter)
{
kdWarning() << "No K menu group with X-KDE-BaseGroup=info found ! Defaulting to Settings/Information/" << endl;
- _baseGroup = TQString::fromLatin1("Settings/Information/");
+ _baseGroup = TQString::tqfromLatin1("Settings/Information/");
}
else
{
kdWarning() << "No K menu group with X-KDE-BaseGroup=settings found ! Defaulting to Settings/" << endl;
- _baseGroup = TQString::fromLatin1("Settings/");
+ _baseGroup = TQString::tqfromLatin1("Settings/");
}
}
}
diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp
index bc4e402f8..9cb2037eb 100644
--- a/kcontrol/kcontrol/helpwidget.cpp
+++ b/kcontrol/kcontrol/helpwidget.cpp
@@ -42,7 +42,7 @@ void HelpWidget::setText(const TQString& docPath, const TQString& text)
helptext = text;
else
helptext = (text + i18n("<p>Use the \"What's This?\" (Shift+F1) to get help on specific options.</p><p>To read the full manual click <a href=\"%1\">here</a>.</p>")
- .arg(docPath.local8Bit()));
+ .tqarg(static_cast<const char *>(docPath.local8Bit())));
}
void HelpWidget::setBaseText()
@@ -69,7 +69,7 @@ bool HelpWidget::clicked(const TQString & _url)
if ( _url.isNull() )
return true;
- if ( _url.find('@') > -1 ) {
+ if ( _url.tqfind('@') > -1 ) {
kapp->invokeMailer(_url);
return true;
}
diff --git a/kcontrol/kcontrol/helpwidget.h b/kcontrol/kcontrol/helpwidget.h
index 5a78e87d3..1a01cc860 100644
--- a/kcontrol/kcontrol/helpwidget.h
+++ b/kcontrol/kcontrol/helpwidget.h
@@ -23,7 +23,7 @@
class TQWidget;
class TQWhatsThis;
-class HelpWidget : public QWhatsThis
+class HelpWidget : public TQWhatsThis
{
public:
HelpWidget(TQWidget *parent);
diff --git a/kcontrol/kcontrol/indexwidget.cpp b/kcontrol/kcontrol/indexwidget.cpp
index cf57dc0e4..92b9cf0a0 100644
--- a/kcontrol/kcontrol/indexwidget.cpp
+++ b/kcontrol/kcontrol/indexwidget.cpp
@@ -60,7 +60,7 @@ void IndexWidget::resizeEvent(TQResizeEvent *e)
void IndexWidget::moduleSelected(ConfigModule *m)
{
- const TQObject *obj = sender();
+ const TQObject *obj = TQT_TQOBJECT_CONST(sender());
if(!m) return;
emit moduleActivated(m);
diff --git a/kcontrol/kcontrol/indexwidget.h b/kcontrol/kcontrol/indexwidget.h
index a0591fcd1..6471e0ec3 100644
--- a/kcontrol/kcontrol/indexwidget.h
+++ b/kcontrol/kcontrol/indexwidget.h
@@ -29,7 +29,7 @@ class ConfigModule;
class ModuleTreeView;
class ModuleIconView;
-class IndexWidget : public QWidgetStack
+class IndexWidget : public TQWidgetStack
{
Q_OBJECT
diff --git a/kcontrol/kcontrol/kcrootonly.cpp b/kcontrol/kcontrol/kcrootonly.cpp
index 723895de3..9b7991298 100644
--- a/kcontrol/kcontrol/kcrootonly.cpp
+++ b/kcontrol/kcontrol/kcrootonly.cpp
@@ -30,9 +30,9 @@ KCRootOnly::KCRootOnly(TQWidget *parent, const char *name)
TQLabel *label = new TQLabel(i18n("<big>You need super user privileges to run this control module.</big><br>"
"Click on the \"Administrator Mode\" button below."), this);
layout->addWidget(label);
- label->setAlignment(AlignCenter);
+ label->tqsetAlignment(AlignCenter);
label->setTextFormat(RichText);
- label->setMinimumSize(label->sizeHint());
+ label->setMinimumSize(label->tqsizeHint());
}
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index 758b742fd..a780b608e 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -59,7 +59,7 @@ KControlApp::KControlApp()
KGlobal::setActiveInstance(this);
// KUniqueApplication does dcop regitration for us
- ModuleIface *modIface = new ModuleIface(toplevel, "moduleIface");
+ ModuleIface *modIface = new ModuleIface(TQT_TQOBJECT(toplevel), "moduleIface");
connect (modIface, TQT_SIGNAL(helpClicked()), toplevel, TQT_SLOT(slotHelpRequest()));
connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest()));
@@ -77,9 +77,9 @@ KControlApp::KControlApp()
int fontSize = toplevel->fontInfo().pointSize();
if (fontSize == 0)
fontSize = (toplevel->fontInfo().pixelSize() * 72) / pdm.logicalDpiX();
- int x = config->readNumEntry(TQString::fromLatin1("InitialWidth %1").arg(desk.width()),
+ int x = config->readNumEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk.width()),
QMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) );
- int y = config->readNumEntry(TQString::fromLatin1("InitialHeight %1").arg(desk.height()),
+ int y = config->readNumEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk.height()),
QMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) );
toplevel->resize(x,y);
}
@@ -90,9 +90,9 @@ KControlApp::~KControlApp()
{
KConfig *config = KGlobal::config();
config->setGroup("General");
- TQWidget *desk = TQApplication::desktop();
- config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
- config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height());
+ TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop());
+ config->writeEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
+ config->writeEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height());
config->sync();
}
delete toplevel;
diff --git a/kcontrol/kcontrol/moduleIface.cpp b/kcontrol/kcontrol/moduleIface.cpp
index 6d40a8bf7..687b3a412 100644
--- a/kcontrol/kcontrol/moduleIface.cpp
+++ b/kcontrol/kcontrol/moduleIface.cpp
@@ -26,7 +26,7 @@
ModuleIface::ModuleIface(TQObject *parent, const char *name)
: TQObject(parent, name), DCOPObject(name) {
- _parent = static_cast<TQWidget *>(parent);
+ _parent = TQT_TQWIDGET(parent);
}
diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp
index c6df5cb71..c8e9bdc01 100644
--- a/kcontrol/kcontrol/moduleiconview.cpp
+++ b/kcontrol/kcontrol/moduleiconview.cpp
@@ -92,7 +92,7 @@ void ModuleIconView::fill()
// go-back node
ModuleIconItem *i = new ModuleIconItem(this, i18n("Back"), icon);
i->setOrderNo(0);
- int last_slash = _path.findRev('/', -2);
+ int last_slash = _path.tqfindRev('/', -2);
if (last_slash == -1)
i->setTag(TQString::null);
else
diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp
index ad60eda5a..908b6003e 100644
--- a/kcontrol/kcontrol/modulemenu.cpp
+++ b/kcontrol/kcontrol/modulemenu.cpp
@@ -70,7 +70,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
// Item names may contain ampersands. To avoid them being converted to
// accelators, replace them with two ampersands.
TQString name = group->caption();
- name.replace("&", "&&");
+ name.tqreplace("&", "&&");
parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall)
, name, menu);
@@ -85,7 +85,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
// Item names may contain ampersands. To avoid them being converted to
// accelators, replace them with two ampersands.
TQString name = module->moduleName();
- name.replace("&", "&&");
+ name.tqreplace("&", "&&");
int realid = parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall)
, name, id);
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index cc8c63af4..97b36719a 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -142,12 +142,12 @@ void ConfigModule::runAsRoot()
// create an embed widget that will embed the
// kcmshell running as root
- _embedLayout = new TQVBoxLayout(_module->parentWidget());
- _embedFrame = new TQVBox( _module->parentWidget() );
+ _embedLayout = new TQVBoxLayout(_module->tqparentWidget());
+ _embedFrame = new TQVBox( _module->tqparentWidget() );
_embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised );
TQPalette pal( red );
pal.setColor( TQColorGroup::Background,
- _module->parentWidget()->colorGroup().background() );
+ _module->tqparentWidget()->tqcolorGroup().background() );
_embedFrame->setPalette( pal );
_embedFrame->setLineWidth( 2 );
_embedFrame->setMidLineWidth( 2 );
@@ -158,7 +158,7 @@ void ConfigModule::runAsRoot()
_module->hide();
_embedFrame->show();
TQLabel *_busy = new TQLabel(i18n("<big>Loading...</big>"), _embedStack);
- _busy->setAlignment(AlignCenter);
+ _busy->tqsetAlignment(AlignCenter);
_busy->setTextFormat(RichText);
_busy->setGeometry(0,0, _module->width(), _module->height());
_busy->show();
@@ -170,18 +170,18 @@ void ConfigModule::runAsRoot()
bool kdeshell = false;
if (cmd.left(5) == "kdesu")
{
- cmd = cmd.remove(0,5).stripWhiteSpace();
+ cmd = TQString(cmd.remove(0,5)).stripWhiteSpace();
// remove all kdesu switches
while( cmd.length() > 1 && cmd[ 0 ] == '-' )
{
- int pos = cmd.find( ' ' );
- cmd = cmd.remove( 0, pos ).stripWhiteSpace();
+ int pos = cmd.tqfind( ' ' );
+ cmd = TQString(cmd.remove( 0, pos )).stripWhiteSpace();
}
}
if (cmd.left(8) == "kcmshell")
{
- cmd = cmd.remove(0,8).stripWhiteSpace();
+ cmd = TQString(cmd.remove(0,8)).stripWhiteSpace();
kdeshell = true;
}
@@ -316,7 +316,7 @@ bool ConfigModuleList::readDesktopEntriesRecursive(const TQString &path)
TQPtrList<ConfigModule> ConfigModuleList::modules(const TQString &path)
{
- Menu *menu = subMenus.find(path);
+ Menu *menu = subMenus.tqfind(path);
if (menu)
return menu->modules;
@@ -325,7 +325,7 @@ TQPtrList<ConfigModule> ConfigModuleList::modules(const TQString &path)
TQStringList ConfigModuleList::submenus(const TQString &path)
{
- Menu *menu = subMenus.find(path);
+ Menu *menu = subMenus.tqfind(path);
if (menu)
return menu->submenus;
@@ -338,7 +338,7 @@ TQString ConfigModuleList::findModule(ConfigModule *module)
Menu *menu;
for(;(menu = it.current());++it)
{
- if (menu->modules.containsRef(module))
+ if (menu->modules.tqcontainsRef(module))
return it.currentKey();
}
return TQString::null;
diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp
index 6f767ab20..d685f7fe8 100644
--- a/kcontrol/kcontrol/moduletreeview.cpp
+++ b/kcontrol/kcontrol/moduletreeview.cpp
@@ -49,7 +49,7 @@ static TQPixmap appIcon(const TQString &iconName)
return normal;
}
-class ModuleTreeWhatsThis : public QWhatsThis
+class ModuleTreeWhatsThis : public TQWhatsThis
{
public:
ModuleTreeWhatsThis( ModuleTreeView* tree)
@@ -133,9 +133,9 @@ void ModuleTreeView::fill(ModuleTreeItem *parent, const TQString &parentPath)
-TQSize ModuleTreeView::sizeHint() const
+TQSize ModuleTreeView::tqsizeHint() const
{
- return TQListView::sizeHint().boundedTo(
+ return TQListView::tqsizeHint().boundedTo(
TQSize( fontMetrics().maxWidth()*35, QWIDGETSIZE_MAX) );
}
@@ -166,7 +166,7 @@ void ModuleTreeView::expandItem(TQListViewItem *item, TQPtrList<TQListViewItem>
{
while (item)
{
- setOpen(item, parentList->contains(item));
+ setOpen(item, parentList-.tqcontains(item));
if (item->childCount() != 0)
expandItem(item->firstChild(), parentList);
@@ -312,7 +312,7 @@ void ModuleTreeItem::setPixmap(int column, const TQPixmap& pm)
{
if (!pm.isNull())
{
- ModuleTreeItem* p = dynamic_cast<ModuleTreeItem*>(parent());
+ ModuleTreeItem* p = dynamic_cast<ModuleTreeItem*>(tqparent());
if (p)
p->regChildIconWidth(pm.width());
}
@@ -331,7 +331,7 @@ void ModuleTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int colu
if (!pixmap(0))
{
int offset = 0;
- ModuleTreeItem* parentItem = dynamic_cast<ModuleTreeItem*>(parent());
+ ModuleTreeItem* parentItem = dynamic_cast<ModuleTreeItem*>(tqparent());
if (parentItem)
{
offset = parentItem->maxChildIconWidth();
@@ -356,7 +356,7 @@ void ModuleTreeItem::setGroup(const TQString &path)
{
KServiceGroup::Ptr group = KServiceGroup::group(path);
TQString defName = path.left(path.length()-1);
- int pos = defName.findRev('/');
+ int pos = defName.tqfindRev('/');
if (pos >= 0)
defName = defName.mid(pos+1);
if (group && group->isValid())
diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h
index ede3c8a52..ff01cc24a 100644
--- a/kcontrol/kcontrol/moduletreeview.h
+++ b/kcontrol/kcontrol/moduletreeview.h
@@ -31,7 +31,7 @@ class ConfigModule;
class ConfigModuleList;
class TQPainter;
-class ModuleTreeItem : public QListViewItem
+class ModuleTreeItem : public TQListViewItem
{
public:
@@ -74,7 +74,7 @@ public:
void makeSelected(ConfigModule* module);
void makeVisible(ConfigModule *module);
void fill();
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
signals:
void moduleSelected(ConfigModule*);
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index b8f83c5fc..f3b80bda0 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -39,7 +39,7 @@
#include <kdebug.h>
#include <tqtimer.h>
-class WhatsThis : public QWhatsThis
+class WhatsThis : public TQWhatsThis
{
public:
WhatsThis( ProxyWidget* parent )
@@ -60,7 +60,7 @@ private:
////////////////////////////////////////////////////////////////////////////////////////////////////////
-static void setVisible(TQPushButton *btn, bool vis)
+static void trinity_setVisible(TQPushButton *btn, bool vis)
{
if (vis)
btn->show();
@@ -72,7 +72,7 @@ static void setVisible(TQPushButton *btn, bool vis)
////////////////////////////////////////////////////////////////////////////////////////////////////////
-class RootInfoWidget : public QLabel
+class RootInfoWidget : public TQLabel
{
public:
RootInfoWidget(TQWidget *parent, const char *name);
@@ -100,7 +100,7 @@ RootInfoWidget::RootInfoWidget(TQWidget *parent, const char *name = 0)
////////////////////////////////////////////////////////////////////////////////////////////////////////
-class ProxyView : public QScrollView
+class ProxyView : public TQScrollView
{
public:
ProxyView(KCModule *client, const TQString& title, TQWidget *parent, bool run_as_root, const char *name);
@@ -113,14 +113,14 @@ private:
bool scroll;
};
-class ProxyContentWidget : public QWidget
+class ProxyContentWidget : public TQWidget
{
public:
ProxyContentWidget( TQWidget* parent ) : TQWidget( parent ) {}
~ProxyContentWidget(){}
// this should be really done by qscrollview in AutoOneFit mode!
- TQSize sizeHint() const { return minimumSizeHint(); }
+ TQSize tqsizeHint() const { return tqminimumSizeHint(); }
};
@@ -144,7 +144,7 @@ ProxyView::ProxyView(KCModule *_client, const TQString&, TQWidget *parent, bool
}
client->reparent(contentWidget,0,TQPoint(0,0),true);
vbox->addWidget( client );
- vbox->activate(); // make sure we have a proper minimumSizeHint
+ vbox->activate(); // make sure we have a proper tqminimumSizeHint
addChild(contentWidget);
}
@@ -215,11 +215,11 @@ ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name,
// only enable the requested buttons
int b = _client->buttons();
- setVisible(_handbook, (b & KCModule::Help));
- setVisible(_default, mayModify && (b & KCModule::Default));
- setVisible(_apply, mayModify && (b & KCModule::Apply));
- setVisible(_reset, mayModify && (b & KCModule::Apply));
- setVisible(_root, run_as_root);
+ trinity_setVisible(_handbook, (b & KCModule::Help));
+ trinity_setVisible(_default, mayModify && (b & KCModule::Default));
+ trinity_setVisible(_apply, mayModify && (b & KCModule::Apply));
+ trinity_setVisible(_reset, mayModify && (b & KCModule::Apply));
+ trinity_setVisible(_root, run_as_root);
// disable initial buttons
_apply->setEnabled( false );
diff --git a/kcontrol/kcontrol/proxywidget.h b/kcontrol/kcontrol/proxywidget.h
index 6fc062dc8..f8a7e9ee3 100644
--- a/kcontrol/kcontrol/proxywidget.h
+++ b/kcontrol/kcontrol/proxywidget.h
@@ -36,7 +36,7 @@ class KAboutData;
class ProxyView;
-class ProxyWidget : public QWidget
+class ProxyWidget : public TQWidget
{
Q_OBJECT
diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp
index e4949622d..2333774ba 100644
--- a/kcontrol/kcontrol/searchwidget.cpp
+++ b/kcontrol/kcontrol/searchwidget.cpp
@@ -34,7 +34,7 @@
/**
* Helper class for sorting icon modules by name without losing the fileName ID
*/
-class ModuleItem : public QListBoxPixmap
+class ModuleItem : public TQListBoxPixmap
{
public:
ModuleItem(ConfigModule *module, TQListBox * listbox = 0) :
diff --git a/kcontrol/kcontrol/searchwidget.h b/kcontrol/kcontrol/searchwidget.h
index 42827f1f4..abf094c2d 100644
--- a/kcontrol/kcontrol/searchwidget.h
+++ b/kcontrol/kcontrol/searchwidget.h
@@ -48,7 +48,7 @@ class KeywordListEntry
};
-class SearchWidget : public QWidget
+class SearchWidget : public TQWidget
{
Q_OBJECT
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index aac3427ff..a4023f88c 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -49,7 +49,7 @@
#include "toplevel.moc"
TopLevel::TopLevel(const char* name)
- : KMainWindow( 0, name, WStyle_ContextHelp )
+ : KMainWindow( 0, name, (WFlags)WStyle_ContextHelp )
, _active(0), dummyAbout(0)
{
setCaption(TQString::null);
@@ -86,7 +86,7 @@ TopLevel::TopLevel(const char* name)
}
// create the layout box
- _splitter = new TQSplitter( TQSplitter::Horizontal, this );
+ _splitter = new TQSplitter( Qt::Horizontal, this );
TQFrame* leftFrame = new TQFrame ( _splitter );
TQBoxLayout *leftFrameLayout = new TQVBoxLayout( leftFrame );
@@ -142,7 +142,7 @@ TopLevel::TopLevel(const char* name)
// help widget
_help = new HelpWidget(_dock);
- _stack->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+ _stack->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
// Restore sizes
config->setGroup("General");
@@ -234,40 +234,40 @@ bool TopLevel::queryClose()
void TopLevel::setupActions()
{
- KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+ KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
icon_view = new KRadioAction
- (i18n("&Icon View"), 0, this, TQT_SLOT(activateIconView()),
+ (i18n("&Icon View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateIconView()),
actionCollection(), "activate_iconview");
icon_view->setExclusiveGroup( "viewmode" );
tree_view = new KRadioAction
- (i18n("&Tree View"), 0, this, TQT_SLOT(activateTreeView()),
+ (i18n("&Tree View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateTreeView()),
actionCollection(), "activate_treeview");
tree_view->setExclusiveGroup( "viewmode" );
icon_small = new KRadioAction
- (i18n("&Small"), 0, this, TQT_SLOT(activateSmallIcons()),
+ (i18n("&Small"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateSmallIcons()),
actionCollection(), "activate_smallicons");
icon_small->setExclusiveGroup( "iconsize" );
icon_medium = new KRadioAction
- (i18n("&Medium"), 0, this, TQT_SLOT(activateMediumIcons()),
+ (i18n("&Medium"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateMediumIcons()),
actionCollection(), "activate_mediumicons");
icon_medium->setExclusiveGroup( "iconsize" );
icon_large = new KRadioAction
- (i18n("&Large"), 0, this, TQT_SLOT(activateLargeIcons()),
+ (i18n("&Large"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateLargeIcons()),
actionCollection(), "activate_largeicons");
icon_large->setExclusiveGroup( "iconsize" );
icon_huge = new KRadioAction
- (i18n("&Huge"), 0, this, TQT_SLOT(activateHugeIcons()),
+ (i18n("&Huge"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateHugeIcons()),
actionCollection(), "activate_hugeicons");
icon_huge->setExclusiveGroup( "iconsize" );
- about_module = new KAction(i18n("About Current Module"), 0, this, TQT_SLOT(aboutModule()), actionCollection(), "help_about_module");
+ about_module = new KAction(i18n("About Current Module"), 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), actionCollection(), "help_about_module");
about_module->setEnabled(false);
// I need to add this so that each module can get a bug reported,
@@ -514,7 +514,7 @@ void TopLevel::aboutModule()
TQString TopLevel::handleAmpersand( TQString modulename ) const
{
- if( modulename.contains( '&' )) // double it
+ if( modulename.tqcontains( '&' )) // double it
{
for( int i = modulename.length();
i >= 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 11:36:47 +0000