Browse Source

Allow kdebase to (mostly) function correctly with TQt for Qt4

Fix kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the patch)
Fix a newly invalidated section of code under GCC 4.5.2 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6)


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1220927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 12 years ago
parent
commit
cc0ad49c75
  1. 12
      kate/app/kateconfigdialog.cpp
  2. 2
      kate/app/kateconsole.cpp
  3. 10
      kate/app/katedocmanager.cpp
  4. 8
      kate/app/katedocmanageriface.cpp
  5. 8
      kate/app/kateexternaltools.cpp
  6. 8
      kate/app/katefilelist.cpp
  7. 6
      kate/app/katemainwindow.cpp
  8. 17
      kate/app/katemdi.cpp
  9. 8
      kate/app/katemdi.h
  10. 2
      kate/app/katesavemodifieddialog.cpp
  11. 18
      kate/app/kateviewmanager.cpp
  12. 22
      kate/app/kateviewspacecontainer.cpp
  13. 10
      kate/app/kwritemain.cpp
  14. 2
      kate/app/kwritemain.h
  15. 2
      kate/interfaces/plugin.cpp
  16. 2
      kate/interfaces/pluginconfiginterface.cpp
  17. 2
      kate/interfaces/pluginconfiginterfaceextension.cpp
  18. 6
      kate/interfaces/toolviewmanager.cpp
  19. 6
      kcontrol/arts/arts.cpp
  20. 6
      kcontrol/background/bgsettings.cpp
  21. 2
      kcontrol/bell/bell.cpp
  22. 10
      kcontrol/colors/colorscm.cpp
  23. 16
      kcontrol/componentchooser/componentchooser.cpp
  24. 4
      kcontrol/fonts/fonts.cpp
  25. 6
      kcontrol/iccconfig/iccconfig.cpp
  26. 2
      kcontrol/input/Makefile.am
  27. 4
      kcontrol/input/xcursor/previewwidget.cpp
  28. 7
      kcontrol/kcontrol/proxywidget.cpp
  29. 2
      kcontrol/kdm/kdm-appear.cpp
  30. 12
      kcontrol/keys/keyconfig.cpp
  31. 4
      kcontrol/konq/desktopbehavior_impl.cpp
  32. 2
      kcontrol/konqhtml/domainlistview.cpp
  33. 2
      kcontrol/konqhtml/jspolicies.cpp
  34. 4
      kcontrol/konsole/sessioneditor.cpp
  35. 12
      kcontrol/launch/kcmlaunch.cpp
  36. 14
      kcontrol/locale/kcmlocale.cpp
  37. 6
      kcontrol/locale/localetime.cpp
  38. 16
      kcontrol/screensaver/scrnsave.cpp
  39. 4
      kcontrol/usbview/usbdevices.cpp
  40. 1
      kcontrol/view1394/view1394.cpp
  41. 1
      kcontrol/view1394/view1394.h
  42. 8
      kcontrol/view1394/view1394widget.ui
  43. 44
      kdcop/kdcopwindow.cpp
  44. 2
      kdeprint/kjobviewer/kjobviewer.cpp
  45. 2
      kdesktop/Makefile.am
  46. 2
      kdesktop/desktop.cc
  47. 10
      kdesktop/kdiconview.cc
  48. 2
      kdesktop/kshadowengine.cpp
  49. 2
      kdesu/kdesu/kdesu.cpp
  50. 2
      kdialog/kdialog.cpp
  51. 4
      kdm/kfrontend/kgverify.cpp
  52. 6
      kdm/kfrontend/themer/kdmitem.cpp
  53. 2
      kdm/kfrontend/themer/kdmitem.h
  54. 4
      kdm/kfrontend/themer/kdmlabel.cpp
  55. 2
      kdm/kfrontend/themer/kdmpixmap.cpp
  56. 2
      kdm/kfrontend/themer/kdmthemer.cpp
  57. 2
      kdmlib/kgreet_pam.h
  58. 2
      kfind/kftabdlg.cpp
  59. 4
      kfind/kfwin.cpp
  60. 2
      khelpcenter/docentry.cpp
  61. 22
      khelpcenter/history.cpp
  62. 4
      khelpcenter/htmlsearch/htmlsearch.cpp
  63. 4
      khelpcenter/htmlsearch/ktagcombobox.cpp
  64. 2
      khelpcenter/toc.cpp
  65. 4
      khelpcenter/view.cpp
  66. 6
      khotkeys/shared/sound.cpp
  67. 2
      khotkeys/shared/sound.h
  68. 4
      khotkeys/shared/voicesignature.cpp
  69. 12
      kicker/applets/clock/clock.cpp
  70. 6
      kicker/applets/launcher/quickbuttongroup.h
  71. 8
      kicker/applets/launcher/quicklauncher.cpp
  72. 4
      kicker/applets/media/mediaapplet.cpp
  73. 2
      kicker/applets/naughty/NaughtyApplet.h
  74. 4
      kicker/applets/systemtray/systemtrayapplet.cpp
  75. 4
      kicker/extensions/dockbar/dockbarextension.cpp
  76. 14
      kicker/extensions/kasbar/kasbar.cpp
  77. 4
      kicker/extensions/kasbar/kasbar.h
  78. 2
      kicker/extensions/kasbar/kasbarextension.cpp
  79. 6
      kicker/extensions/kasbar/kasgroupitem.cpp
  80. 2
      kicker/extensions/kasbar/kasgroupitem.h
  81. 12
      kicker/extensions/kasbar/kastasker.cpp
  82. 4
      kicker/extensions/kasbar/kastaskitem.cpp
  83. 10
      kicker/kicker/core/containerarealayout.cpp
  84. 2
      kicker/kicker/ui/k_mnu.cpp
  85. 2
      kicker/kicker/ui/k_new_mnu.cpp
  86. 4
      kicker/kicker/ui/removeapplet_mnu.cpp
  87. 4
      kicker/kicker/ui/removebutton_mnu.cpp
  88. 4
      kicker/kicker/ui/removeextension_mnu.cpp
  89. 4
      kicker/kicker/ui/service_mnu.cpp
  90. 3
      kicker/libkicker/global.cpp
  91. 4
      kicker/menuext/prefmenu/prefmenu.cpp
  92. 6
      kicker/taskbar/taskbar.cpp
  93. 25
      kicker/taskbar/taskcontainer.cpp
  94. 4
      kicker/taskmanager/tasklmbmenu.cpp
  95. 2
      kioslave/ldap/kio_ldap.cpp
  96. 10
      kioslave/man/kio_man.cpp
  97. 2
      kioslave/man/man2html.cpp
  98. 6
      kioslave/pop3/pop3.cc
  99. 4
      kioslave/settings/kio_settings.cc
  100. 2
      kioslave/smb/kio_smb_auth.cpp
  101. 4
      kioslave/smb/kio_smb_browse.cpp
  102. 4
      kioslave/smb/kio_smb_mount.cpp
  103. 4
      kioslave/thumbnail/textcreator.cpp
  104. 14
      klipper/clipboardpoll.cpp
  105. 2
      klipper/configdialog.cpp
  106. 2
      klipper/historyitem.cpp
  107. 2
      klipper/historyitem.h
  108. 18
      klipper/toplevel.cpp
  109. 2
      kmenuedit/kmenuedit.cpp
  110. 332
      konqueror/about/konq_aboutpage.cc
  111. 18
      konqueror/iconview/konq_iconview.cc
  112. 4
      konqueror/keditbookmarks/actionsimpl.cpp
  113. 4
      konqueror/keditbookmarks/toplevel.cpp
  114. 18
      konqueror/konq_actions.cc
  115. 2
      konqueror/konq_actions.h
  116. 20
      konqueror/konq_combo.cc
  117. 7
      konqueror/konq_frame.cc
  118. 6
      konqueror/konq_mainwindow.cc
  119. 4
      konqueror/konq_run.cc
  120. 36
      konqueror/konq_tabs.cc
  121. 34
      konqueror/konq_view.cc
  122. 8
      konqueror/konq_view.h
  123. 36
      konqueror/konq_viewmgr.cc
  124. 4
      konqueror/kttsplugin/khtmlkttsd.cpp
  125. 8
      konqueror/listview/konq_infolistviewwidget.cc
  126. 2
      konqueror/listview/konq_listview.cc
  127. 2
      konqueror/listview/konq_listviewitems.cc
  128. 24
      konqueror/listview/konq_listviewwidget.cc
  129. 3
      konqueror/listview/konq_listviewwidget.h
  130. 8
      konqueror/listview/konq_textviewwidget.cc
  131. 8
      konqueror/listview/konq_treeviewwidget.cc
  132. 2
      konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
  133. 2
      konqueror/shellcmdplugin/kshellcmdplugin.cpp
  134. 3
      konqueror/sidebar/konqsidebar.h
  135. 2
      konqueror/sidebar/konqsidebarplugin.cpp
  136. 30
      konqueror/sidebar/sidebar_widget.cpp
  137. 6
      konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
  138. 4
      konqueror/sidebar/trees/konq_sidebartree.cpp
  139. 2
      konqueror/sidebar/trees/konqsidebar_tree.cpp
  140. 21
      konsole/konsole/TEWidget.cpp
  141. 5
      konsole/konsole/TEWidget.h
  142. 2
      konsole/konsole/TEmulation.cpp
  143. 5
      konsole/konsole/keytrans.cpp
  144. 38
      konsole/konsole/konsole.cpp
  145. 6
      konsole/konsole/konsole_part.cpp
  146. 4
      konsole/konsole/schema.h
  147. 12
      kpersonalizer/kstylepage.cpp
  148. 2
      kpersonalizer/ksysinfo.cpp
  149. 2
      kscreensaver/random.cpp
  150. 2
      ksplashml/themeengine/simple/Makefile.am
  151. 2
      ksysguard/gui/SensorDisplayLib/BarGraph.cc
  152. 28
      ksysguard/gui/SensorDisplayLib/DancingBars.cc
  153. 8
      ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
  154. 28
      ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
  155. 10
      ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
  156. 16
      ksysguard/gui/SensorDisplayLib/ListView.cc
  157. 16
      ksysguard/gui/SensorDisplayLib/LogFile.cc
  158. 6
      ksysguard/gui/SensorDisplayLib/MultiMeter.cc
  159. 28
      ksysguard/gui/SensorDisplayLib/ProcessController.cc
  160. 14
      ksysguard/gui/SensorDisplayLib/ProcessList.cc
  161. 8
      ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
  162. 8
      ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
  163. 6
      ksysguard/gui/WorkSheet.cc
  164. 12
      ksysguard/gui/WorkSheetSettings.cc
  165. 2
      ksysguard/gui/ksgrd/HostConnector.cc
  166. 2
      ksysguard/gui/ksgrd/StyleEngine.cc
  167. 2
      ksysguard/gui/ksgrd/StyleSettings.cc
  168. 2
      kwin/COMPLIANCE
  169. 8
      kwin/kcmkwin/kwindecoration/buttons.cpp
  170. 4
      kwin/manage.cpp
  171. 6
      kwin/workspace.cpp
  172. 3
      libkonq/kivdirectoryoverlay.h
  173. 4
      libkonq/knewmenu.cc
  174. 8
      libkonq/konq_bgnddlg.cc
  175. 2
      libkonq/konq_drag.cc
  176. 4
      libkonq/konq_iconviewwidget.cc
  177. 6
      libkonq/konq_operations.cc
  178. 6
      libkonq/konq_pixmapprovider.cc
  179. 2
      nsplugins/viewer/viewer.cpp

12
kate/app/kateconfigdialog.cpp

@ -332,12 +332,12 @@ void KateConfigDialog::removePluginPage (Kate::Plugin *plugin)
for (uint i=0; i<pluginPages.count(); i++)
{
if ( pluginPages.at(i)->plugin == plugin )
if ( pluginPages.tqat(i)->plugin == plugin )
{
TQWidget *w = pluginPages.at(i)->page->tqparentWidget();
delete pluginPages.at(i)->page;
TQWidget *w = pluginPages.tqat(i)->page->tqparentWidget();
delete pluginPages.tqat(i)->page;
delete w;
pluginPages.remove(pluginPages.at(i));
pluginPages.remove(pluginPages.tqat(i));
i--;
}
}
@ -415,7 +415,7 @@ void KateConfigDialog::slotApply()
//
for (uint i=0; i<editorPages.count(); i++)
{
editorPages.at(i)->apply();
editorPages.tqat(i)->apply();
}
v->getDoc()->writeConfig(config);
@ -425,7 +425,7 @@ void KateConfigDialog::slotApply()
//
for (uint i=0; i<pluginPages.count(); i++)
{
pluginPages.at(i)->page->apply();
pluginPages.tqat(i)->page->apply();
}
config->sync();

2
kate/app/kateconsole.cpp

@ -115,7 +115,7 @@ void KateConsole::sendInput( const TQString& text )
if (!m_part) return;
TerminalInterface *t = static_cast<TerminalInterface*>( m_part->tqqt_cast( "TerminalInterface" ) );
TerminalInterface *t = static_cast<TerminalInterface*>( m_part->qt_cast( "TerminalInterface" ) );
if (!t) return;

10
kate/app/katedocmanager.cpp

@ -69,7 +69,7 @@ KateDocManager::~KateDocManager ()
{
// save config
if (!m_docList.isEmpty())
m_docList.at(0)->writeConfig(KateApp::self()->config());
m_docList.tqat(0)->writeConfig(KateApp::self()->config());
if (m_saveMetaInfos)
{
@ -150,7 +150,7 @@ void KateDocManager::deleteDoc (Kate::Document *doc)
Kate::Document *KateDocManager::document (uint n)
{
return m_docList.at(n);
return m_docList.tqat(n);
}
Kate::Document *KateDocManager::activeDocument ()
@ -234,7 +234,7 @@ bool KateDocManager::isOpen(KURL url)
Kate::Document *KateDocManager::openURL (const KURL& url,const TQString &encoding, uint *id, bool isTempFile)
{
// special handling if still only the first initial doc is there
if (!documentList().isEmpty() && (documentList().count() == 1) && (!documentList().at(0)->isModified() && documentList().at(0)->url().isEmpty()))
if (!documentList().isEmpty() && (documentList().count() == 1) && (!documentList().tqat(0)->isModified() && documentList().tqat(0)->url().isEmpty()))
{
Kate::Document* doc = documentList().getFirst();
@ -354,7 +354,7 @@ bool KateDocManager::closeAllDocuments(bool closeURL)
}
while (!docs.isEmpty() && res)
if (! closeDocument(docs.at(0),closeURL) )
if (! closeDocument(docs.tqat(0),closeURL) )
res = false;
else
docs.remove ((uint)0);
@ -364,7 +364,7 @@ bool KateDocManager::closeAllDocuments(bool closeURL)
KateApp::self()->mainWindow(i)->viewManager()->setViewActivationBlocked(false);
for (uint s=0; s < KateApp::self()->mainWindow(i)->viewManager()->containers()->count(); s++)
KateApp::self()->mainWindow(i)->viewManager()->containers()->at(s)->activateView (m_docList.at(0)->documentNumber());
KateApp::self()->mainWindow(i)->viewManager()->containers()->tqat(s)->activateView (m_docList.tqat(0)->documentNumber());
}
return res;

8
kate/app/katedocmanageriface.cpp

@ -35,7 +35,7 @@ DCOPRef KateDocManagerDCOPIface::document (uint n)
if (!doc)
return DCOPRef ();
DCOPObject *obj = static_cast<DCOPObject*>(doc->tqqt_cast("DCOPObject"));
DCOPObject *obj = static_cast<DCOPObject*>(doc->qt_cast("DCOPObject"));
if (!obj)
return DCOPRef ();
@ -50,7 +50,7 @@ DCOPRef KateDocManagerDCOPIface::activeDocument ()
if (!doc)
return DCOPRef ();
DCOPObject *obj = static_cast<DCOPObject*>(doc->tqqt_cast("DCOPObject"));
DCOPObject *obj = static_cast<DCOPObject*>(doc->qt_cast("DCOPObject"));
if (!obj)
return DCOPRef ();
@ -75,7 +75,7 @@ DCOPRef KateDocManagerDCOPIface::documentWithID (uint id)
if (!doc)
return DCOPRef ();
DCOPObject *obj = static_cast<DCOPObject*>(doc->tqqt_cast("DCOPObject"));
DCOPObject *obj = static_cast<DCOPObject*>(doc->qt_cast("DCOPObject"));
if (!obj)
return DCOPRef ();
@ -90,7 +90,7 @@ DCOPRef KateDocManagerDCOPIface::openURL (KURL url, TQString encoding)
if (!doc)
return DCOPRef ();
DCOPObject *obj = static_cast<DCOPObject*>(doc->tqqt_cast("DCOPObject"));
DCOPObject *obj = static_cast<DCOPObject*>(doc->qt_cast("DCOPObject"));
if (!obj)
return DCOPRef ();

8
kate/app/kateexternaltools.cpp

@ -186,12 +186,12 @@ void KateExternalToolsCommand::reload () {
}
bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQString &) {
TQWidget *wv=dynamic_cast<TQWidget*>(view);
TQWidget *wv=tqt_dynamic_cast<TQWidget*>(view);
if (!wv) {
// kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<<endl;
return false;
}
KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->tqtopLevelWidget());
KateMDI::MainWindow *dmw=tqt_dynamic_cast<KateMDI::MainWindow*>(wv->tqtopLevelWidget());
if (!dmw) {
// kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl;
return false;
@ -201,7 +201,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt
if (actionName.isEmpty()) return false;
// kdDebug(13001)<<"actionName is not empty:"<<actionName<<endl;
KateExternalToolsMenuAction *a=
dynamic_cast<KateExternalToolsMenuAction*>(dmw->action("tools_external"));
tqt_dynamic_cast<KateExternalToolsMenuAction*>(dmw->action("tools_external"));
if (!a) return false;
// kdDebug(13001)<<"trying to find action"<<endl;
KAction *a1=a->actionCollection()->action(static_cast<const char *>(actionName.utf8()));
@ -390,7 +390,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged()
KActionPtrList actions = m_actionCollection->actions();
for (KActionPtrList::iterator it = actions.begin(); it != actions.end(); ++it )
{
KateExternalToolAction *action = dynamic_cast<KateExternalToolAction*>(*it);
KateExternalToolAction *action = tqt_dynamic_cast<KateExternalToolAction*>(*it);
if ( action )
{
l = action->tool->mimetypes;

8
kate/app/katefilelist.cpp

@ -272,8 +272,8 @@ void KateFileList::slotModChanged (Kate::Document *doc)
for ( uint i=0; i < m_editHistory.count(); i++ )
{
m_editHistory.at( i )->setEditHistPos( i+1 );
tqrepaintItem( m_editHistory.at( i ) );
m_editHistory.tqat( i )->setEditHistPos( i+1 );
tqrepaintItem( m_editHistory.tqat( i ) );
}
}
else
@ -342,8 +342,8 @@ void KateFileList::slotViewChanged ()
for ( uint i=0; i < m_viewHistory.count(); i++ )
{
m_viewHistory.at( i )->setViewHistPos( i+1 );
tqrepaintItem( m_viewHistory.at( i ) );
m_viewHistory.tqat( i )->setViewHistPos( i+1 );
tqrepaintItem( m_viewHistory.tqat( i ) );
}
}

6
kate/app/katemainwindow.cpp

@ -544,10 +544,10 @@ void KateMainWindow::editKeys()
TQPtrList<Kate::Document> l=KateDocManager::self()->documentList();
for (uint i=0;i<l.count();i++) {
// kdDebug(13001)<<"reloading Keysettings for document "<<i<<endl;
l.at(i)->reloadXML();
TQPtrList<class KTextEditor::View> l1=l.at(i)->views ();//KTextEditor::Document
l.tqat(i)->reloadXML();
TQPtrList<class KTextEditor::View> l1=l.tqat(i)->views ();//KTextEditor::Document
for (uint i1=0;i1<l1.count();i1++) {
l1.at(i1)->reloadXML();
l1.tqat(i1)->reloadXML();
// kdDebug(13001)<<"reloading Keysettings for view "<<i<<"/"<<i1<<endl;
}
}

17
kate/app/katemdi.cpp

@ -239,7 +239,7 @@ ToolView::~ToolView ()
m_mainWin->toolViewDeleted (this);
}
void ToolView::setVisible (bool vis)
void ToolView::tqsetVisible (bool vis)
{
if (m_visible == vis)
return;
@ -256,8 +256,9 @@ bool ToolView::visible () const
void ToolView::childEvent ( TQChildEvent *ev )
{
// set the widget to be focus proxy if possible
if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->tqqt_cast("TQWidget"))
setFocusProxy ((TQWidget *)(TQT_TQOBJECT(ev->child())->tqqt_cast("TQWidget")));
if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->qt_cast("TQWidget")) {
setFocusProxy (::tqqt_cast<QWidget*>(TQT_TQOBJECT(ev->child())));
}
TQVBox::childEvent (ev);
}
@ -379,7 +380,7 @@ bool Sidebar::showWidget (ToolView *widget)
{
it.current()->hide();
setTab (it.currentKey(), false);
it.current()->setVisible(false);
it.current()->tqsetVisible(false);
}
setTab (m_widgetToId[widget], true);
@ -387,7 +388,7 @@ bool Sidebar::showWidget (ToolView *widget)
m_ownSplit->show ();
widget->show ();
widget->setVisible (true);
widget->tqsetVisible (true);
return true;
}
@ -419,7 +420,7 @@ bool Sidebar::hideWidget (ToolView *widget)
if (!anyVis)
m_ownSplit->hide ();
widget->setVisible (false);
widget->tqsetVisible (false);
return true;
}
@ -448,7 +449,7 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev)
if (ev->type()==TQEvent::ContextMenu)
{
TQContextMenuEvent *e = (TQContextMenuEvent *) ev;
KMultiTabBarTab *bt = dynamic_cast<KMultiTabBarTab*>(obj);
KMultiTabBarTab *bt = tqt_dynamic_cast<KMultiTabBarTab*>(obj);
if (bt)
{
kdDebug()<<"Request for popup"<<endl;
@ -617,7 +618,7 @@ void Sidebar::restoreSession (KConfig *config)
ToolView *tv = m_toolviews[i];
tv->persistent = config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Persistent").arg(tv->id), false);
tv->setVisible (config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), false));
tv->tqsetVisible (config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), false));
if (!anyVis)
anyVis = tv->visible();

8
kate/app/katemdi.h

@ -41,6 +41,7 @@ namespace KateMDI {
class Splitter : public TQSplitter
{
Q_OBJECT
TQ_OBJECT
public:
Splitter(Orientation o, TQWidget* parent=0, const char* name=0);
@ -60,6 +61,7 @@ class Splitter : public TQSplitter
class ToggleToolViewAction : public KToggleAction
{
Q_OBJECT
TQ_OBJECT
public:
ToggleToolViewAction ( const TQString& text, const KShortcut& cut,
@ -78,6 +80,7 @@ class ToggleToolViewAction : public KToggleAction
class GUIClient : public TQObject, public KXMLGUIClient
{
Q_OBJECT
TQ_OBJECT
public:
GUIClient ( class MainWindow *mw );
@ -102,6 +105,7 @@ class GUIClient : public TQObject, public KXMLGUIClient
class ToolView : public TQVBox
{
Q_OBJECT
TQ_OBJECT
friend class Sidebar;
friend class MainWindow;
@ -142,7 +146,7 @@ class ToolView : public TQVBox
Sidebar *sidebar () { return m_sidebar; }
void setVisible (bool vis);
void tqsetVisible (bool vis);
public:
bool visible () const;
@ -176,6 +180,7 @@ class ToolView : public TQVBox
class Sidebar : public KMultiTabBar
{
Q_OBJECT
TQ_OBJECT
public:
Sidebar (KMultiTabBar::KMultiTabBarPosition pos, class MainWindow *mainwin, TQWidget *parent);
@ -248,6 +253,7 @@ class Sidebar : public KMultiTabBar
class MainWindow : public KParts::MainWindow
{
Q_OBJECT
TQ_OBJECT
friend class ToolView;

2
kate/app/katesavemodifieddialog.cpp

@ -152,7 +152,7 @@ KateSaveModifiedDialog::KateSaveModifiedDialog(TQWidget *parent, TQPtrList<Kate:
m_documentRoot=new TQListViewItem(m_list,i18n("Documents"));
const uint docCnt=documents.count();
for (uint i=0;i<docCnt;i++) {
new KateSaveModifiedDocumentCheckListItem(m_documentRoot,documents.at(i));
new KateSaveModifiedDocumentCheckListItem(m_documentRoot,documents.tqat(i));
}
m_documentRoot->setOpen(true);
} else m_documentRoot=0;

18
kate/app/kateviewmanager.cpp

@ -168,7 +168,7 @@ void KateViewManager::updateViewSpaceActions ()
}
void KateViewManager::tabChanged(TQWidget* widget) {
KateViewSpaceContainer *container=static_cast<KateViewSpaceContainer*>(widget->tqqt_cast("KateViewSpaceContainer"));
KateViewSpaceContainer *container=static_cast<KateViewSpaceContainer*>(widget->qt_cast("KateViewSpaceContainer"));
Q_ASSERT(container);
m_currentContainer=container;
@ -316,7 +316,7 @@ uint KateViewManager::viewCount ()
{
uint viewCount=0;
for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
viewCount+=m_viewSpaceContainerList.at(i)->viewCount();
viewCount+=m_viewSpaceContainerList.tqat(i)->viewCount();
}
return viewCount;
@ -326,7 +326,7 @@ uint KateViewManager::viewSpaceCount ()
{
uint viewSpaceCount=0;
for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
viewSpaceCount+=m_viewSpaceContainerList.at(i)->viewSpaceCount();
viewSpaceCount+=m_viewSpaceContainerList.tqat(i)->viewSpaceCount();
}
return viewSpaceCount;
}
@ -334,7 +334,7 @@ uint KateViewManager::viewSpaceCount ()
void KateViewManager::setViewActivationBlocked (bool block)
{
for (uint i=0;i<m_viewSpaceContainerList.count();i++)
m_viewSpaceContainerList.at(i)->m_blockViewCreationAndActivation=block;
m_viewSpaceContainerList.tqat(i)->m_blockViewCreationAndActivation=block;
}
void KateViewManager::activateNextView()
@ -354,7 +354,7 @@ void KateViewManager::activatePrevView()
void KateViewManager::closeViews(uint documentNumber)
{
for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
m_viewSpaceContainerList.at(i)->closeViews(documentNumber);
m_viewSpaceContainerList.tqat(i)->closeViews(documentNumber);
}
tabChanged(m_currentContainer);
}
@ -454,7 +454,7 @@ void KateViewManager::setShowFullPath( bool enable )
{
showFullPath=enable;
for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
m_viewSpaceContainerList.at(i)->setShowFullPath(enable);
m_viewSpaceContainerList.tqat(i)->setShowFullPath(enable);
}
m_mainWindow->slotWindowActivated ();
}
@ -477,7 +477,7 @@ void KateViewManager::saveViewConfiguration(KConfig *config,const TQString& grp)
config->writeEntry("ViewSpaceContainers",m_viewSpaceContainerList.count());
config->writeEntry("Active ViewSpaceContainer", m_mainWindow->tabWidget()->currentPageIndex());
for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
m_viewSpaceContainerList.at(i)->saveViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i));
m_viewSpaceContainerList.tqat(i)->saveViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i));
}
}
@ -495,10 +495,10 @@ void KateViewManager::restoreViewConfiguration (KConfig *config, const TQString&
uint tabCount=config->readNumEntry("ViewSpaceContainers",0);
int activeOne=config->readNumEntry("Active ViewSpaceContainer",0);
if (tabCount==0) return;
m_viewSpaceContainerList.at(0)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-0:"));
m_viewSpaceContainerList.tqat(0)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-0:"));
for (uint i=1;i<tabCount;i++) {
slotNewTab();
m_viewSpaceContainerList.at(i)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i));
m_viewSpaceContainerList.tqat(i)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i));
}
if (activeOne != m_mainWindow->tabWidget()->currentPageIndex())

22
kate/app/kateviewspacecontainer.cpp

@ -277,7 +277,7 @@ void KateViewSpaceContainer::activateView ( Kate::View *view )
setActiveView (view);
m_viewList.tqfindRef (view);
mainWindow()->toolBar ()->setUpdatesEnabled (false);
mainWindow()->toolBar ()->tqsetUpdatesEnabled (false);
if (m_viewManager->guiMergedView)
mainWindow()->guiFactory()->removeClient (m_viewManager->guiMergedView );
@ -287,7 +287,7 @@ void KateViewSpaceContainer::activateView ( Kate::View *view )
if (!m_blockViewCreationAndActivation)
mainWindow()->guiFactory ()->addClient( view );
mainWindow()->toolBar ()->setUpdatesEnabled (true);
mainWindow()->toolBar ()->tqsetUpdatesEnabled (true);
statusMsg();
@ -342,8 +342,8 @@ void KateViewSpaceContainer::activateNextView()
if (i >= m_viewSpaceList.count())
i=0;
setActiveSpace (m_viewSpaceList.at(i));
activateView(m_viewSpaceList.at(i)->currentView());
setActiveSpace (m_viewSpaceList.tqat(i));
activateView(m_viewSpaceList.tqat(i)->currentView());
}
void KateViewSpaceContainer::activatePrevView()
@ -353,8 +353,8 @@ void KateViewSpaceContainer::activatePrevView()
if (i < 0)
i=m_viewSpaceList.count()-1;
setActiveSpace (m_viewSpaceList.at(i));
activateView(m_viewSpaceList.at(i)->currentView());
setActiveSpace (m_viewSpaceList.tqat(i));
activateView(m_viewSpaceList.tqat(i)->currentView());
}
void KateViewSpaceContainer::closeViews(uint documentNumber)
@ -363,7 +363,7 @@ void KateViewSpaceContainer::closeViews(uint documentNumber)
for (uint z=0 ; z < m_viewList.count(); z++)
{
Kate::View* current = m_viewList.at(z);
Kate::View* current = m_viewList.tqat(z);
if ( current->getDoc()->documentNumber() == documentNumber )
{
closeList.append (current);
@ -450,7 +450,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
TQValueList<int> psizes;
if ( ! isFirstTime )
if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->tqparentWidget()->tqqt_cast("TQSplitter")) )
if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->tqparentWidget()->qt_cast("TQSplitter")) )
psizes = ps->sizes();
Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal;
@ -471,7 +471,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
s->moveToFirst( vsNew );
if (!isFirstTime)
if (TQSplitter *ps = static_cast<TQSplitter*>(s->tqparentWidget()->tqqt_cast("TQSplitter")) )
if (TQSplitter *ps = static_cast<TQSplitter*>(s->tqparentWidget()->qt_cast("TQSplitter")) )
ps->setSizes( psizes );
s->show();
@ -644,7 +644,7 @@ void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQ
{
// send all views + their gui to **** ;)
for (uint i=0; i < m_viewList.count(); i++)
mainWindow()->guiFactory ()->removeClient (m_viewList.at(i));
mainWindow()->guiFactory ()->removeClient (m_viewList.tqat(i));
m_viewList.clear ();
@ -658,7 +658,7 @@ void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQ
// finally, make the correct view active.
config->setGroup (group);
/*
KateViewSpace *vs = m_viewSpaceList.at( config->readNumEntry("Active ViewSpace") );
KateViewSpace *vs = m_viewSpaceList.tqat( config->readNumEntry("Active ViewSpace") );
if ( vs )
activateSpace( vs->currentView() );
*/

10
kate/app/kwritemain.cpp

@ -107,8 +107,8 @@ KWrite::KWrite (KTextEditor::Document *doc)
guiFactory()->addClient( m_view );
// install a working kate part popup dialog thingy
if (static_cast<Kate::View*>(m_view->tqqt_cast("Kate::View")))
static_cast<Kate::View*>(m_view->tqqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) );
if (static_cast<Kate::View*>(m_view->qt_cast("Kate::View")))
static_cast<Kate::View*>(m_view->qt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) );
// init with more usefull size, stolen from konq :)
if (!initialGeometrySet())
@ -474,7 +474,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents
TQString buf = TQString("Document %1").arg(z);
config->setGroup(buf);
KTextEditor::Document *doc = docList.at(z - 1);
KTextEditor::Document *doc = docList.tqat(z - 1);
if (KTextEditor::configInterface(doc))
KTextEditor::configInterface(doc)->writeSessionConfig(config);
@ -485,7 +485,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents
TQString buf = TQString("Window %1").arg(z);
config->setGroup(buf);
config->writeEntry("DocumentNumber",docList.tqfind(winList.at(z-1)->view()->document()) + 1);
config->writeEntry("DocumentNumber",docList.tqfind(winList.tqat(z-1)->view()->document()) + 1);
}
}
@ -521,7 +521,7 @@ void KWrite::restore()
{
buf = TQString("Window %1").arg(z);
config->setGroup(buf);
t = new KWrite(docList.at(config->readNumEntry("DocumentNumber") - 1));
t = new KWrite(docList.tqat(config->readNumEntry("DocumentNumber") - 1));
t->restore(config,z);
}
}

2
kate/app/kwritemain.h

@ -38,6 +38,7 @@ class KRecentFilesAction;
class KWrite : public KParts::MainWindow
{
Q_OBJECT
TQ_OBJECT
public:
KWrite(KTextEditor::Document * = 0L);
@ -122,6 +123,7 @@ class KWrite : public KParts::MainWindow
class KWriteEditorChooser: public KDialogBase
{
Q_OBJECT
TQ_OBJECT
public:
KWriteEditorChooser(TQWidget *parent);

2
kate/interfaces/plugin.cpp

@ -99,7 +99,7 @@ PluginViewInterface *pluginViewInterface (Plugin *plugin)
if (!plugin)
return 0;
return static_cast<PluginViewInterface*>(plugin->tqqt_cast("Kate::PluginViewInterface"));
return static_cast<PluginViewInterface*>(plugin->qt_cast("Kate::PluginViewInterface"));
}
}

2
kate/interfaces/pluginconfiginterface.cpp

@ -59,5 +59,5 @@ PluginConfigInterface *Kate::pluginConfigInterface (Plugin *plugin)
if (!plugin)
return 0;
return static_cast<PluginConfigInterface*>(plugin->tqqt_cast("Kate::PluginConfigInterface"));
return static_cast<PluginConfigInterface*>(plugin->qt_cast("Kate::PluginConfigInterface"));
}

2
kate/interfaces/pluginconfiginterfaceextension.cpp

@ -64,5 +64,5 @@ PluginConfigInterfaceExtension *Kate::pluginConfigInterfaceExtension (Plugin *pl
if (!plugin)
return 0;
return static_cast<PluginConfigInterfaceExtension*>(plugin->tqqt_cast("Kate::PluginConfigInterfaceExtension"));
return static_cast<PluginConfigInterfaceExtension*>(plugin->qt_cast("Kate::PluginConfigInterfaceExtension"));
}

6
kate/interfaces/toolviewmanager.cpp

@ -60,7 +60,7 @@ TQWidget *ToolViewManager::createToolView (const TQString &identifier, ToolViewM
bool ToolViewManager::moveToolView (TQWidget *widget, ToolViewManager::Position pos)
{
if (!widget || !widget->tqqt_cast("KateMDI::ToolView"))
if (!widget || !widget->qt_cast("KateMDI::ToolView"))
return false;
return d->toolViewMan->moveToolView (static_cast<KateMDI::ToolView*>(widget), (KMultiTabBar::KMultiTabBarPosition)pos);
@ -68,7 +68,7 @@ bool ToolViewManager::moveToolView (TQWidget *widget, ToolViewManager::Position
bool ToolViewManager::showToolView(TQWidget *widget)
{
if (!widget || !widget->tqqt_cast("KateMDI::ToolView"))
if (!widget || !widget->qt_cast("KateMDI::ToolView"))
return false;
return d->toolViewMan->showToolView (static_cast<KateMDI::ToolView*>(widget));
@ -76,7 +76,7 @@ bool ToolViewManager::showToolView(TQWidget *widget)
bool ToolViewManager::hideToolView(TQWidget *widget)
{
if (!widget || !widget->tqqt_cast("KateMDI::ToolView"))
if (!widget || !widget->qt_cast("KateMDI::ToolView"))
return false;
return d->toolViewMan->hideToolView (static_cast<KateMDI::ToolView*>(widget));

6
kcontrol/arts/arts.cpp

@ -297,7 +297,7 @@ void KArtsModule::load( bool useDefaults )
{
if(a->name == audioIO) // first item: "autodetect"
{
hardware->audioIO->setCurrentItem(audioIOList.at() + 1);
hardware->audioIO->setCurrentItem(audioIOList.tqat() + 1);
break;
}
@ -334,7 +334,7 @@ void KArtsModule::saveParams( void )
int item = hardware->audioIO->currentItem() - 1; // first item: "default"
if (item >= 0) {
audioIO = audioIOList.at(item)->name;
audioIO = audioIOList.tqat(item)->name;
}
TQString dev = customDevice->isChecked() ? deviceName->text() : TQString::null;
@ -498,7 +498,7 @@ void KArtsModule::updateWidgets()
int item = hardware->audioIO->currentItem() - 1; // first item: "default"
if (item >= 0)
{
audioIO = audioIOList.at(item)->name;
audioIO = audioIOList.tqat(item)->name;
bool jack = (audioIO == TQString::tqfromLatin1("jack"));
if(jack)
{

6
kcontrol/background/bgsettings.cpp

@ -148,7 +148,7 @@ bool KBackgroundPattern::isAvailable()
if (m_Pattern.isEmpty())
return false;
TQString file = m_Pattern;
if (file.at(0) != '/')
if (file.tqat(0) != '/')
file = m_pDirs->findResource("dtop_pattern", file);
TQFileInfo fi(file);
return (fi.exists());
@ -895,7 +895,7 @@ void KBackgroundSettings::randomizeWallpaperFiles()
tmpList.pop_front();
while(tmpList.count())
{
randomList.insert(randomList.at(
randomList.insert(randomList.tqat(
rseq.getLong(randomList.count()+1)),
1, tmpList.front());
@ -985,7 +985,7 @@ bool KBackgroundSettings::discardCurrentWallpaper()
{
return false;
}
m_WallpaperFiles.remove(m_WallpaperFiles.at(m_CurrentWallpaper));
m_WallpaperFiles.remove(m_WallpaperFiles.tqat(m_CurrentWallpaper));
--m_CurrentWallpaper;
changeWallpaper();

2
kcontrol/bell/bell.cpp

@ -74,7 +74,7 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name):
box->setColumnLayout( 0, Qt::Horizontal );
layout->addWidget(box);
layout->addStretch();
TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint());
TQGridLayout *grid = new TQGridLayout(box->tqlayout(), KDialog::spacingHint());
grid->setColStretch(0, 0);
grid->setColStretch(1, 1);
grid->addColSpacing(0, 30);

10
kcontrol/colors/colorscm.cpp

@ -440,7 +440,7 @@ void KColorScheme::sliderValueChanged( int val )
void KColorScheme::slotSave( )
{
KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes);
KColorSchemeEntry *entry = mSchemeList->tqat(sList->currentItem()-nSysSchemes);
if (!entry) return;
sCurrentScheme = entry->path;
KSimpleConfig *config = new KSimpleConfig(sCurrentScheme );
@ -482,7 +482,7 @@ void KColorScheme::slotSave( )
void KColorScheme::slotRemove()
{
uint ind = sList->currentItem();
KColorSchemeEntry *entry = mSchemeList->at(ind-nSysSchemes);
KColorSchemeEntry *entry = mSchemeList->tqat(ind-nSysSchemes);
if (!entry) return;
if (unlink(TQFile::encodeName(entry->path).data())) {
@ -497,7 +497,7 @@ void KColorScheme::slotRemove()
mSchemeList->remove(entry);
ind = sList->currentItem();
entry = mSchemeList->at(ind-nSysSchemes);
entry = mSchemeList->tqat(ind-nSysSchemes);
if (!entry) return;
removeBt->setEnabled(entry ? entry->local : false);
}
@ -795,7 +795,7 @@ void KColorScheme::readScheme( int index )
config->setGroup("General");
} else {
// Open scheme file
KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes);
KColorSchemeEntry *entry = mSchemeList->tqat(sList->currentItem()-nSysSchemes);
if (!entry) return;
sCurrentScheme = entry->path;
config = new KSimpleConfig(sCurrentScheme, true);
@ -941,7 +941,7 @@ void KColorScheme::slotPreviewScheme(int indx)
removeBt->setEnabled(false);
else
{
KColorSchemeEntry *entry = mSchemeList->at(indx-nSysSchemes);
KColorSchemeEntry *entry = mSchemeList->tqat(indx-nSysSchemes);
removeBt->setEnabled(entry ? entry->local : false);
}

16
kcontrol/componentchooser/componentchooser.cpp

@ -417,7 +417,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
TQWidget *newConfigWidget = 0;
if (cfgType.isEmpty() || (cfgType=="component"))
{
if (!(configWidget && configWidget->tqqt_cast("CfgComponent")))
if (!(configWidget && configWidget->qt_cast("CfgComponent")))
{
CfgComponent* cfgcomp = new CfgComponent(configContainer);
cfgcomp->ChooserDocu->setText(i18n("Choose from the list below which component should be used by default for the %1 service.").arg(it->text()));
@ -430,7 +430,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
}
else if (cfgType=="internal_email")
{
if (!(configWidget && configWidget->tqqt_cast("CfgEmailClient")))
if (!(configWidget && configWidget->qt_cast("CfgEmailClient")))
{
newConfigWidget = new CfgEmailClient(configContainer);
}
@ -438,7 +438,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
}
else if (cfgType=="internal_terminal")
{
if (!(configWidget && configWidget->tqqt_cast("CfgTerminalEmulator")))
if (!(configWidget && configWidget->qt_cast("CfgTerminalEmulator")))
{
newConfigWidget = new CfgTerminalEmulator(configContainer);
}
@ -446,7 +446,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
}
else if (cfgType=="internal_browser")
{
if (!(configWidget && configWidget->tqqt_cast("CfgBrowser")))
if (!(configWidget && configWidget->qt_cast("CfgBrowser")))
{
newConfigWidget = new CfgBrowser(configContainer);
}
@ -465,7 +465,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
}
if (configWidget)
static_cast<CfgPlugin*>(configWidget->tqqt_cast("CfgPlugin"))->load(&cfg);
static_cast<CfgPlugin*>(configWidget->qt_cast("CfgPlugin"))->load(&cfg);
emitChanged(false);
latestEditedService=static_cast<MyListBoxItem*>(it)->File;
@ -487,7 +487,7 @@ void ComponentChooser::load() {
if( configWidget )
{
CfgPlugin * plugin = static_cast<CfgPlugin*>(
configWidget->tqqt_cast( "CfgPlugin" ) );
configWidget->qt_cast( "CfgPlugin" ) );
if( plugin )
{
KSimpleConfig cfg(latestEditedService);
@ -500,7 +500,7 @@ void ComponentChooser::save() {
if( configWidget )
{
CfgPlugin * plugin = static_cast<CfgPlugin*>(
configWidget->tqqt_cast( "CfgPlugin" ) );
configWidget->qt_cast( "CfgPlugin" ) );
if( plugin )
{
KSimpleConfig cfg(latestEditedService);
@ -512,7 +512,7 @@ void ComponentChooser::save() {
void ComponentChooser::restoreDefault() {
if (configWidget)
{
static_cast<CfgPlugin*>(configWidget->tqqt_cast("CfgPlugin"))->defaults();
static_cast<CfgPlugin*>(configWidget->qt_cast("CfgPlugin"))->defaults();
emitChanged(true);
}

4
kcontrol/fonts/fonts.cpp

@ -688,7 +688,7 @@ void KFonts::load()
void KFonts::load( bool useDefaults )
{
for ( uint i = 0; i < fontUseList.count(); i++ )
fontUseList.at( i )->readFont( useDefaults );
fontUseList.tqat( i )->readFont( useDefaults );
useAA_original = useAA = aaSettings->load( useDefaults ) ? AAEnabled : AADisabled;
cbAA->setCurrentItem( useAA );
@ -779,7 +779,7 @@ void KFonts::slotApplyFontDiff()
if (ret == KDialog::Accepted && fontDiffFlags)
{
for ( int i = 0; i < (int) fontUseList.count(); i++ )
fontUseList.at( i )->applyFontDiff( font,fontDiffFlags );
fontUseList.tqat( i )->applyFontDiff( font,fontDiffFlags );
emit changed(true);
}
}

6
kcontrol/iccconfig/iccconfig.cpp

@ -286,7 +286,7 @@ void KICCConfig::load(bool useDefaults )
base->deleteProfileButton->setFixedWidth(90);
XRROutputInfo *output_info;
KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI::KRandrSimpleAPI();
KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI();
config->setReadDefaults( useDefaults );
@ -356,7 +356,7 @@ void KICCConfig::save()
{
int i;
int j;
KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI::KRandrSimpleAPI();
KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI();
// Write system configuration
systemconfig->setGroup(NULL);
@ -408,4 +408,4 @@ TQString KICCConfig::quickHelp() const
" for a more lifelike and vibrant image.");
}
#include "iccconfig.moc"
#include "iccconfig.moc"

2
kcontrol/input/Makefile.am

@ -16,7 +16,7 @@ bin_PROGRAMS = kapplymousetheme
kapplymousetheme_SOURCES = kapplymousetheme.cpp
kapplymousetheme_LDFLAGS = $(all_libraries)
kapplymousetheme_LDADD = $(LIB_XCURSOR) $(LIB_X11)
kapplymousetheme_LDADD = $(LIB_XCURSOR) $(LIB_X11) $(LIB_QT)
kde_module_LTLIBRARIES = kcm_input.la

4
kcontrol/input/xcursor/previewwidget.cpp

@ -286,7 +286,7 @@ PreviewWidget::~PreviewWidget()
void PreviewWidget::setTheme( const TQString &theme )
{
setUpdatesEnabled( false );
tqsetUpdatesEnabled( false );
int minHeight = previewSize + 20; // Minimum height of the preview widget
int maxHeight = height(); // Tallest cursor height
@ -302,7 +302,7 @@ void PreviewWidget::setTheme( const TQString &theme )
current = -1;
setFixedSize( ( maxWidth + cursorSpacing ) * numCursors, kMax( maxHeight, minHeight ) );
setUpdatesEnabled( true );
tqsetUpdatesEnabled( true );
tqrepaint( false );
}

7
kcontrol/kcontrol/proxywidget.cpp

@ -256,7 +256,12 @@ ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name,
ProxyWidget::~ProxyWidget()
{
delete _client;
#ifdef USE_QT4
#warning Possible memory leak in ProxyWidget::~ProxyWidget()
#else // USE_QT4
if (_client) delete _client;
_client = 0;
#endif // USE_QT4
}
TQString ProxyWidget::quickHelp() const

2
kcontrol/kdm/kdm-appear.cpp

@ -216,7 +216,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
loadLanguageList(langcombo);
connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
label = new TQLabel(langcombo, i18n("Languag&e:"), group);
TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
TQGridLayout *hbox = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() );
hbox->setColStretch(1, 1);
hbox->addWidget(label, 1, 0);
hbox->addWidget(langcombo, 1, 1);

12
kcontrol/keys/keyconfig.cpp

@ -238,7 +238,7 @@ void KKeyModule::defaults()
uint ind = sList->currentItem();
if ( !d.remove( *sFileList->at( ind ) ) ) {
if ( !d.remove( *sFileList->tqat( ind ) ) ) {
KMessageBox::sorry( 0,
i18n("This key scheme could not be removed.\n"
"Perhaps you do not have permission to alter the file "
@ -247,7 +247,7 @@ void KKeyModule::defaults()
}
sList->removeItem( ind );
sFileList->remove( sFileList->at(ind) );
sFileList->remove( sFileList->tqat(ind) );
}*/
void KKeyModule::slotKeyChange()
@ -258,7 +258,7 @@ void KKeyModule::slotKeyChange()
/*void KKeyModule::slotSave( )
{
KSimpleConfig config(*sFileList->at( sList->currentItem() ) );
KSimpleConfig config(*sFileList->tqat( sList->currentItem() ) );
// global=true is necessary in order to
// let both 'Global Shortcuts' and 'Shortcut Sequences' be
// written to the same scheme file.
@ -281,7 +281,7 @@ void KKeyModule::readScheme( int index )
else {
KConfigBase* config = 0;
if( index == 0 ) config = new KConfig( "kdeglobals" );
//else config = new KSimpleConfig( *sFileList->at( index ), true );
//else config = new KSimpleConfig( *sFileList->tqat( index ), true );
actions.readActions( (index == 0) ? KeySet : KeyScheme, config );
kc->listSync();
@ -416,8 +416,8 @@ void KKeyModule::readScheme( int index )
// Set various appropriate for the scheme
if ( indx < nSysSchemes ||
(*sFileList->at(indx)).tqcontains( "/global-" ) ||
(*sFileList->at(indx)).tqcontains( "/app-" ) ) {
(*sFileList->tqat(indx)).tqcontains( "/global-" ) ||
(*sFileList->tqat(indx)).tqcontains( "/app-" ) ) {
removeBt->setEnabled( FALSE );
} else {
removeBt->setEnabled( TRUE );