TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of classes to enhance compatibility with KDE4

Browse Source
pull/2/head
Timothy Pearson 12 years ago
parent dc5f267664
commit f537c21b68
418 changed files with 2193 additions and 2193 deletions
Show Stats Download Patch File Download Diff File

2
doc/userguide/tde-for-admins.docbook
Unescape Escape View File

@ -1009,7 +1009,7 @@ applications communicate with <command>tdelauncher</command> over &DCOP; in
order to start new applications or services.</para>
<para>Best known from the error message: <computeroutput><errortext>
KLauncher could not be reached via DCOP </errortext></computeroutput> which
TDELauncher could not be reached via DCOP </errortext></computeroutput> which
either indicates a serious problem with the <command>dcopserver</command> or
that <command>tdelauncher</command> crashed.</para>

2
kappfinder/toplevel.cpp
Unescape Escape View File

@ -107,7 +107,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
TQAccel *accel = new TQAccel( this );
accel->connectItem( accel->insertItem( Key_Q + CTRL ), kapp, TQT_SLOT( quit() ) );
KAcceleratorManager::manage( this );
TDEAcceleratorManager::manage( this );
}

2
kate/app/kateapp.cpp
Unescape Escape View File

@ -154,7 +154,7 @@ void KateApp::restoreKate ()
Kate::Document::setOpenErrorDialogsActivated (true);
// restore all windows ;)
for (int n=1; KMainWindow::canBeRestored(n); n++)
for (int n=1; TDEMainWindow::canBeRestored(n); n++)
newMainWindow(sessionConfig(), TQString ("%1").arg(n));
// oh, no mainwindow, create one, should not happen, but make sure ;)

2
kate/app/kateconfigplugindialogpage.cpp
Unescape Escape View File

@ -64,7 +64,7 @@ void KatePluginListItem::stateChange(bool b)
}
KatePluginListView::KatePluginListView(TQWidget *parent, const char *name)
: KListView(parent, name)
: TDEListView(parent, name)
{
}

2
kate/app/kateconfigplugindialogpage.h
Unescape Escape View File

@ -29,7 +29,7 @@
class KatePluginListItem;
class KatePluginListView : public KListView
class KatePluginListView : public TDEListView
{
Q_OBJECT

14
kate/app/kateexternaltools.cpp
Unescape Escape View File

@ -204,7 +204,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt
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()));
TDEAction *a1=a->actionCollection()->action(static_cast<const char *>(actionName.utf8()));
if (!a1) return false;
// kdDebug(13001)<<"activating action"<<endl;
a1->activate();
@ -219,7 +219,7 @@ bool KateExternalToolsCommand::help (Kate::View *, const TQString &, TQString &)
//BEGIN KateExternalToolAction
KateExternalToolAction::KateExternalToolAction( TQObject *parent,
const char *name, KateExternalTool *t)
: KAction( parent, name ),
: TDEAction( parent, name ),
tool ( t )
{
setText( t->name );
@ -295,11 +295,11 @@ KateExternalToolsMenuAction::KateExternalToolsMenuAction( const TQString &text,
TQObject *parent,
const char* name,
KateMainWindow *mw )
: KActionMenu( text, parent, name ),
: TDEActionMenu( text, parent, name ),
mainwindow( mw )
{
m_actionCollection = new KActionCollection( mainwindow );
m_actionCollection = new TDEActionCollection( mainwindow );
connect(KateDocManager::self(),TQT_SIGNAL(documentChanged()),this,TQT_SLOT(slotDocumentChanged()));
@ -387,8 +387,8 @@ void KateExternalToolsMenuAction::slotDocumentChanged()
TQStringList l;
bool b;
KActionPtrList actions = m_actionCollection->actions();
for (KActionPtrList::iterator it = actions.begin(); it != actions.end(); ++it )
TDEActionPtrList actions = m_actionCollection->actions();
for (TDEActionPtrList::iterator it = actions.begin(); it != actions.end(); ++it )
{
KateExternalToolAction *action = tqt_dynamic_cast<KateExternalToolAction*>(*it);
if ( action )
@ -561,7 +561,7 @@ KateExternalToolsConfigWidget::KateExternalToolsConfigWidget( TQWidget *parent,
{
TQGridLayout *lo = new TQGridLayout( this, 5, 5, 0, KDialog::spacingHint() );
lbTools = new KListBox( this );
lbTools = new TDEListBox( this );
lo->addMultiCellWidget( lbTools, 1, 4, 0, 3 );
connect( lbTools, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) );

10
kate/app/kateexternaltools.h
Unescape Escape View File

@ -51,7 +51,7 @@
* hidden if the current file is not of one of the indicated types.
*
*/
class KateExternalToolsMenuAction : public KActionMenu
class KateExternalToolsMenuAction : public TDEActionMenu
{
friend class KateExternalToolAction;
@ -65,20 +65,20 @@ class KateExternalToolsMenuAction : public KActionMenu
*/
void reload();
class KActionCollection *actionCollection() { return m_actionCollection; }
class TDEActionCollection *actionCollection() { return m_actionCollection; }
private slots:
void slotDocumentChanged();
private:
class KActionCollection *m_actionCollection;
class TDEActionCollection *m_actionCollection;
class KateMainWindow *mainwindow; // for the actions to access view/doc managers
};
/**
* This Action contains a KateExternalTool
*/
class KateExternalToolAction : public KAction, public KWordMacroExpander
class KateExternalToolAction : public TDEAction, public KWordMacroExpander
{
Q_OBJECT
public:
@ -168,7 +168,7 @@ class KateExternalToolsConfigWidget : public Kate::ConfigPage
TQStringList m_removed;
class KListBox *lbTools;
class TDEListBox *lbTools;
class TQPushButton *btnNew, *btnRemove, *btnEdit, *btnMoveUp, *btnMoveDwn;
class TDEConfig *config;

18
kate/app/katefilelist.cpp
Unescape Escape View File

@ -83,7 +83,7 @@ class ToolTip : public TQToolTip
KateFileList::KateFileList (KateMainWindow *main,
KateViewManager *_viewManager,
TQWidget * parent, const char * name )
: KListView (parent, name)
: TDEListView (parent, name)
, m_sort( KateFileList::sortByID )
{
m_main = main;
@ -138,12 +138,12 @@ void KateFileList::setupActions ()
{
windowNext = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotPrevDocument()), m_main->actionCollection());
windowPrev = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotNextDocument()), m_main->actionCollection());
sortAction = new KSelectAction( i18n("Sort &By"), 0,
sortAction = new TDESelectAction( i18n("Sort &By"), 0,
m_main->actionCollection(), "filelist_sortby" );
listMoveFileUp = new KAction( i18n("Move File Up"), 0, m_main->actionCollection(), "filelist_move_up" );
//listMoveFileUp->setShortcut(KShortcut(CTRL + SHIFT + Key_Comma));
listMoveFileDown = new KAction( i18n("Move File Down"), 0, m_main->actionCollection(), "filelist_move_down" );
//listMoveFileDown->setShortcut(KShortcut(CTRL + SHIFT + Key_Period));
listMoveFileUp = new TDEAction( i18n("Move File Up"), 0, m_main->actionCollection(), "filelist_move_up" );
//listMoveFileUp->setShortcut(TDEShortcut(CTRL + SHIFT + Key_Comma));
listMoveFileDown = new TDEAction( i18n("Move File Down"), 0, m_main->actionCollection(), "filelist_move_down" );
//listMoveFileDown->setShortcut(TDEShortcut(CTRL + SHIFT + Key_Period));
connect( listMoveFileUp, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileUp()) );
connect( listMoveFileDown, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileDown()) );
TQStringList l;
@ -166,7 +166,7 @@ void KateFileList::keyPressEvent(TQKeyEvent *e) {
}
else
{
KListView::keyPressEvent(e);
TDEListView::keyPressEvent(e);
}
}
@ -179,12 +179,12 @@ void KateFileList::contentsMousePressEvent( TQMouseEvent *e )
if ( ! itemAt( contentsToViewport( e->pos() ) ) )
return;
KListView::contentsMousePressEvent( e );
TDEListView::contentsMousePressEvent( e );
}
void KateFileList::resizeEvent( TQResizeEvent *e )
{
KListView::resizeEvent( e );
TDEListView::resizeEvent( e );
// ### We may want to actually calculate the widest field,
// since it's not automatically scrinked. If I add support for

16
kate/app/katefilelist.h
Unescape Escape View File

@ -35,8 +35,8 @@
class KateMainWindow;
class KAction;
class KSelectAction;
class TDEAction;
class TDESelectAction;
class KateFileListItem : public TQListViewItem
{
@ -74,7 +74,7 @@ class KateFileListItem : public TQListViewItem
uint m_docNumber;
};
class KateFileList : public KListView
class KateFileList : public TDEListView
{
Q_OBJECT
@ -152,11 +152,11 @@ class KateFileList : public KListView
int m_sort;
bool notify;
KAction* windowNext;
KAction* windowPrev;
KSelectAction* sortAction;
KAction* listMoveFileUp;
KAction* listMoveFileDown;
TDEAction* windowNext;
TDEAction* windowPrev;
TDESelectAction* sortAction;
TDEAction* listMoveFileUp;
TDEAction* listMoveFileDown;
TQPtrList<KateFileListItem> m_viewHistory;
TQPtrList<KateFileListItem> m_editHistory;

32
kate/app/katefileselector.cpp
Unescape Escape View File

@ -71,7 +71,7 @@ static void silenceQToolBar(TQtMsgType, const char *){}
// helper classes to be able to have a toolbar without move handle
KateFileSelectorToolBar::KateFileSelectorToolBar(TQWidget *parent)
: KToolBar( parent, "Kate FileSelector Toolbar", true )
: TDEToolBar( parent, "Kate FileSelector Toolbar", true )
{
setMinimumWidth(10);
}
@ -80,7 +80,7 @@ KateFileSelectorToolBar::~KateFileSelectorToolBar(){}
void KateFileSelectorToolBar::setMovingEnabled( bool)
{
KToolBar::setMovingEnabled(false);
TDEToolBar::setMovingEnabled(false);
}
@ -111,7 +111,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
mainwin(mainWindow),
viewmanager(viewManager)
{
mActionCollection = new KActionCollection( this );
mActionCollection = new TDEActionCollection( this );
TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar );
@ -136,18 +136,18 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
this, TQT_SLOT( selectorViewChanged(KFileView *) ) );
setStretchFactor(dir, 2);
KActionCollection *coll = dir->actionCollection();
TDEActionCollection *coll = dir->actionCollection();
// some shortcuts of diroperator that clashes with Kate
coll->action( "delete" )->setShortcut( KShortcut( ALT + Key_Delete ) );
coll->action( "reload" )->setShortcut( KShortcut( ALT + Key_F5 ) );
coll->action( "back" )->setShortcut( KShortcut( ALT + SHIFT + Key_Left ) );
coll->action( "forward" )->setShortcut( KShortcut( ALT + SHIFT + Key_Right ) );
coll->action( "delete" )->setShortcut( TDEShortcut( ALT + Key_Delete ) );
coll->action( "reload" )->setShortcut( TDEShortcut( ALT + Key_F5 ) );
coll->action( "back" )->setShortcut( TDEShortcut( ALT + SHIFT + Key_Left ) );
coll->action( "forward" )->setShortcut( TDEShortcut( ALT + SHIFT + Key_Right ) );
// some consistency - reset up for dir too
coll->action( "up" )->setShortcut( KShortcut( ALT + SHIFT + Key_Up ) );
coll->action( "home" )->setShortcut( KShortcut( CTRL + ALT + Key_Home ) );
coll->action( "up" )->setShortcut( TDEShortcut( ALT + SHIFT + Key_Up ) );
coll->action( "home" )->setShortcut( TDEShortcut( CTRL + ALT + Key_Home ) );
// bookmarks action!
KActionMenu *acmBookmarks = new KActionMenu( i18n("Bookmarks"), "bookmark",
TDEActionMenu *acmBookmarks = new TDEActionMenu( i18n("Bookmarks"), "bookmark",
mActionCollection, "bookmarks" );
acmBookmarks->setDelayed( false );
bookmarkHandler = new KBookmarkHandler( this, acmBookmarks->popupMenu() );
@ -167,9 +167,9 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
filter, TQT_SLOT( addToHistory(const TQString&) ) );
// kaction for the dir sync method
acSyncDir = new KAction( i18n("Current Document Folder"), "curfiledir", 0,
acSyncDir = new TDEAction( i18n("Current Document Folder"), "curfiledir", 0,
TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
toolbar->setIconText( KToolBar::IconOnly );
toolbar->setIconText( TDEToolBar::IconOnly );
toolbar->setIconSize( 16 );
toolbar->setEnableContextMenu( false );
@ -268,7 +268,7 @@ void KateFileSelector::setupToolbar( TDEConfig *config )
"short view" << "detailed view" <<
"bookmarks" << "sync_dir";
}
KAction *ac;
TDEAction *ac;
for ( TQStringList::Iterator it=tbactions.begin(); it != tbactions.end(); ++it ) {
if ( *it == "bookmarks" || *it == "sync_dir" )
ac = mActionCollection->action( (*it).latin1() );
@ -534,7 +534,7 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KateFileSelect
// Toolbar - a lot for a little...
TQGroupBox *gbToolbar = new TQGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this );
acSel = new KActionSelector( gbToolbar );
acSel = new TDEActionSelector( gbToolbar );
acSel->setAvailableLabel( i18n("A&vailable actions:") );
acSel->setSelectedLabel( i18n("S&elected actions:") );
lo->addWidget( gbToolbar );
@ -689,7 +689,7 @@ void KFSConfigPage::init()
"show hidden" << "properties"*/ <<
"bookmarks" << "sync_dir";
TQRegExp re("&(?=[^&])");
KAction *ac;
TDEAction *ac;
TQListBox *lb;
for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) {
lb = l.contains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();

14
kate/app/katefileselector.h
Unescape Escape View File

@ -33,8 +33,8 @@
class KateMainWindow;
class KateViewManager;
class KActionCollection;
class KActionSelector;
class TDEActionCollection;
class TDEActionSelector;
class KFileView;
/*
@ -46,7 +46,7 @@ class KFileView;
*/
/* I think this fix for not moving toolbars is better */
class KateFileSelectorToolBar: public KToolBar
class KateFileSelectorToolBar: public TDEToolBar
{
Q_OBJECT
public:
@ -88,7 +88,7 @@ class KateFileSelector : public TQVBox
void setupToolbar( TDEConfig * );
void setView( KFile::FileView );
KDirOperator *dirOperator(){ return dir; }
KActionCollection *actionCollection() { return mActionCollection; };
TDEActionCollection *actionCollection() { return mActionCollection; };
public slots:
void slotFilterChange(const TQString&);
@ -113,11 +113,11 @@ class KateFileSelector : public TQVBox
private:
class KateFileSelectorToolBar *toolbar;
KActionCollection *mActionCollection;
TDEActionCollection *mActionCollection;
class KBookmarkHandler *bookmarkHandler;
KURLComboBox *cmbPath;
KDirOperator * dir;
class KAction *acSyncDir;
class TDEAction *acSyncDir;
KHistoryCombo * filter;
class TQToolButton *btnFilter;
@ -159,7 +159,7 @@ class KFSConfigPage : public Kate::ConfigPage {
void init();
KateFileSelector *fileSelector;
KActionSelector *acSel;
TDEActionSelector *acSel;
class TQSpinBox *sbPathHistLength, *sbFilterHistLength;
class TQCheckBox *cbSyncActive, *cbSyncShow;
class TQCheckBox *cbSesLocation, *cbSesFilter;

2
kate/app/kategrepdialog.cpp
Unescape Escape View File

@ -195,7 +195,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
layout->activate();
KAcceleratorManager::manage( this );
TDEAcceleratorManager::manage( this );
TQWhatsThis::add(lPattern,
i18n("<p>Enter the expression you want to search for here."

2
kate/app/katemailfilesdialog.cpp
Unescape Escape View File

@ -57,7 +57,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow *mainwin )
"<p>Press <strong>Mail...</strong> to email the current document."
"<p>To select more documents to send, press <strong>Show All Documents&nbsp;&gt;&gt;</strong>."), mw );
// TODO avoid untill needed - later
list = new KListView( mw );
list = new TDEListView( mw );
list->addColumn( i18n("Name") );
list->addColumn( i18n("URL") );
Kate::Document *currentDoc = mainWindow->viewManager()->activeView()->getDoc();

2
kate/app/katemailfilesdialog.h
Unescape Escape View File

@ -49,7 +49,7 @@ class KateMailDialog : public KDialogBase {
private slots:
void slotShowButton();
private:
class KListView *list;
class TDEListView *list;
class TQLabel *lInfo;
KateMainWindow *mainWindow;
class TQVBox *mw;

12
kate/app/katemain.h
Unescape Escape View File

@ -36,21 +36,21 @@ class TQVBoxLayout;
class TQString;
class TQWidgetStack;
class KAction;
class KActionMenu;
class TDEAction;
class TDEActionMenu;
class TDEConfig;
class KDirOperator;
class KEditToolbar;
class KFileViewItem;
class KHistoryCombo;
class KLineEdit;
class KListBox;
class TDEListBox;
class TDEProcess;
class KPushButton;
class KRecentFilesAction;
class KSelectAction;
class TDERecentFilesAction;
class TDESelectAction;
class KStatusBar;
class KToggleAction;
class TDEToggleAction;
class KURL;
class KURLComboBox;

28
kate/app/katemainwindow.cpp
Unescape Escape View File

@ -237,7 +237,7 @@ void KateMainWindow::setupMainWindow ()
void KateMainWindow::setupActions()
{
KAction *a;
TDEAction *a;
KStdAction::openNew( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document"));
KStdAction::open( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing"));
@ -245,19 +245,19 @@ void KateMainWindow::setupActions()
fileOpenRecent = KStdAction::openRecent (TQT_TQOBJECT(m_viewManager), TQT_SLOT(openURL (const KURL&)), actionCollection());
fileOpenRecent->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again."));
a=new KAction( i18n("Save A&ll"),"save_all", CTRL+Key_L, KateDocManager::self(), TQT_SLOT( saveAll() ), actionCollection(), "file_save_all" );
a=new TDEAction( i18n("Save A&ll"),"save_all", CTRL+Key_L, KateDocManager::self(), TQT_SLOT( saveAll() ), actionCollection(), "file_save_all" );
a->setWhatsThis(i18n("Save all open, modified documents to disk."));
KStdAction::close( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document."));
a=new KAction( i18n( "Clos&e All" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" );
a=new TDEAction( i18n( "Clos&e All" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" );
a->setWhatsThis(i18n("Close all open documents."));
KStdAction::mail( TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments."));
KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window"));
a=new KAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection(), "view_new_view");
a=new TDEAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection(), "view_new_view");
a->setWhatsThis(i18n("Create a new Kate view (a new window with the same document list)."));
if ( KateApp::self()->authorize("shell_access") )
@ -266,10 +266,10 @@ void KateMainWindow::setupActions()
externalTools->setWhatsThis( i18n("Launch external helper applications") );
}
KToggleAction* showFullScreenAction = KStdAction::fullScreen( 0, 0, actionCollection(),this);
TDEToggleAction* showFullScreenAction = KStdAction::fullScreen( 0, 0, actionCollection(),this);
connect( showFullScreenAction,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(slotFullScreen(bool)));
documentOpenWith = new KActionMenu(i18n("Open W&ith"), actionCollection(), "file_open_with");
documentOpenWith = new TDEActionMenu(i18n("Open W&ith"), actionCollection(), "file_open_with");
documentOpenWith->setWhatsThis(i18n("Open the current document using another application registered for its file type, or an application of your choice."));
connect(documentOpenWith->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(mSlotFixOpenWithMenu()));
connect(documentOpenWith->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenWithMenuAction(int)));
@ -280,19 +280,19 @@ void KateMainWindow::setupActions()
a=KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection());
a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
KAction* settingsConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure");
TDEAction* settingsConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure");
settingsConfigure->setWhatsThis(i18n("Configure various aspects of this application and the editing component."));
// pipe to terminal action
if (KateApp::self()->authorize("shell_access"))
new KAction(i18n("&Pipe to Console"), "pipe", 0, TQT_TQOBJECT(console), TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal");
new TDEAction(i18n("&Pipe to Console"), "pipe", 0, TQT_TQOBJECT(console), TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal");
// tip of the day :-)
KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application."));
if (KatePluginManager::self()->pluginList().count() > 0)
{
a=new KAction(i18n("&Plugins Handbook"), 0, TQT_TQOBJECT(this), TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents");
a=new TDEAction(i18n("&Plugins Handbook"), 0, TQT_TQOBJECT(this), TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents");
a->setWhatsThis(i18n("This shows help files for various available plugins."));
}
@ -302,11 +302,11 @@ void KateMainWindow::setupActions()
slotWindowActivated ();
// session actions
new KAction(i18n("Menu entry Session->New", "&New"), "filenew", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new");
new KAction(i18n("&Open..."), "fileopen", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open");
new KAction(i18n("&Save"), "filesave", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save");
new KAction(i18n("Save &As..."), "filesaveas", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as");
new KAction(i18n("&Manage..."), "view_choose", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionManage()), actionCollection(), "sessions_manage");
new TDEAction(i18n("Menu entry Session->New", "&New"), "filenew", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new");
new TDEAction(i18n("&Open..."), "fileopen", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open");
new TDEAction(i18n("&Save"), "filesave", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save");
new TDEAction(i18n("Save &As..."), "filesaveas", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as");
new TDEAction(i18n("&Manage..."), "view_choose", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionManage()), actionCollection(), "sessions_manage");
// quick open menu ;)
new KateSessionsAction (i18n("&Quick Open"), actionCollection(), "sessions_list");

10
kate/app/katemainwindow.h
Unescape Escape View File

@ -40,7 +40,7 @@ namespace Kate {
}
class KFileItem;
class KRecentFilesAction;
class TDERecentFilesAction;
class DCOPObject;
class KateExternalToolsMenuAction;
@ -192,17 +192,17 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
// management items
KateViewManager *m_viewManager;
KRecentFilesAction *fileOpenRecent;
TDERecentFilesAction *fileOpenRecent;
KateFileList *filelist;
KateFileSelector *fileselector;
KActionMenu* documentOpenWith;
TDEActionMenu* documentOpenWith;
TQPopupMenu *documentMenu;
KToggleAction* settingsShowFilelist;
KToggleAction* settingsShowFileselector;
TDEToggleAction* settingsShowFilelist;
TDEToggleAction* settingsShowFileselector;
KateExternalToolsMenuAction *externalTools;
GrepTool * greptool;

22
kate/app/katemdi.cpp
Unescape Escape View File

@ -66,9 +66,9 @@ int Splitter::idAfter ( TQWidget * w ) const
//BEGIN TOGGLETOOLVIEWACTION
ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const KShortcut& cut, ToolView *tv,
ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const TDEShortcut& cut, ToolView *tv,
TQObject* parent, const char* name )
: KToggleAction(text,cut,parent,name)
: TDEToggleAction(text,cut,parent,name)
, m_tv(tv)
{
connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool)));
@ -137,8 +137,8 @@ GUIClient::GUIClient ( MainWindow *mw )
if (actionCollection()->kaccel()==0)
actionCollection()->setWidget(m_mw);
m_toolMenu = new KActionMenu(i18n("Tool &Views"),actionCollection(),"kate_mdi_toolview_menu");
m_showSidebarsAction = new KToggleAction( i18n("Show Side&bars"),
m_toolMenu = new TDEActionMenu(i18n("Tool &Views"),actionCollection(),"kate_mdi_toolview_menu");
m_showSidebarsAction = new TDEToggleAction( i18n("Show Side&bars"),
CTRL|ALT|SHIFT|Key_F, actionCollection(), "kate_mdi_sidebar_visibility" );
m_showSidebarsAction->setCheckedState(i18n("Hide Side&bars"));
m_showSidebarsAction->setChecked( m_mw->sidebarsVisible() );
@ -146,7 +146,7 @@ GUIClient::GUIClient ( MainWindow *mw )
m_mw, TQT_SLOT( setSidebarsVisible( bool ) ) );
m_toolMenu->insert( m_showSidebarsAction );
m_toolMenu->insert( new KActionSeparator( m_toolMenu ) );
m_toolMenu->insert( new TDEActionSeparator( m_toolMenu ) );
// read shortcuts
actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() );
@ -166,14 +166,14 @@ void GUIClient::registerToolView (ToolView *tv)
TQString aname = TQString("kate_mdi_toolview_") + tv->id;
// try to read the action shortcut
KShortcut sc;
TDEShortcut sc;
TDEConfig *cfg = kapp->config();
TQString _grp = cfg->group();
cfg->setGroup("Shortcuts");
sc = KShortcut( cfg->readEntry( aname, "" ) );
sc = TDEShortcut( cfg->readEntry( aname, "" ) );
cfg->setGroup( _grp );
KToggleAction *a = new ToggleToolViewAction(i18n("Show %1").arg(tv->text),
TDEToggleAction *a = new ToggleToolViewAction(i18n("Show %1").arg(tv->text),
sc,tv, actionCollection(), aname.latin1() );
a->setCheckedState(TQString(i18n("Hide %1").arg(tv->text)));
@ -188,7 +188,7 @@ void GUIClient::registerToolView (ToolView *tv)
void GUIClient::unregisterToolView (ToolView *tv)
{
KAction *a = m_toolToAction[tv];
TDEAction *a = m_toolToAction[tv];
if (!a)
return;
@ -214,7 +214,7 @@ void GUIClient::updateActions()
unplugActionList( actionListName );
TQPtrList<KAction> addList;
TQPtrList<TDEAction> addList;
addList.append(m_toolMenu);
plugActionList( actionListName, addList );
@ -460,7 +460,7 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev)
if (w)
{
KPopupMenu *p = new KPopupMenu (this);
TDEPopupMenu *p = new TDEPopupMenu (this);
p->insertTitle(SmallIcon("view_remove"), i18n("Behavior"), 50);

12
kate/app/katemdi.h
Unescape Escape View File

@ -58,13 +58,13 @@ class Splitter : public TQSplitter
int idAfter ( TQWidget * w ) const;
};
class ToggleToolViewAction : public KToggleAction
class ToggleToolViewAction : public TDEToggleAction
{
Q_OBJECT
public:
ToggleToolViewAction ( const TQString& text, const KShortcut& cut,
ToggleToolViewAction ( const TQString& text, const TDEShortcut& cut,
class ToolView *tv, TQObject* parent = 0, const char* name = 0 );
virtual ~ToggleToolViewAction();
@ -96,10 +96,10 @@ class GUIClient : public TQObject, public KXMLGUIClient
private:
MainWindow *m_mw;
KToggleAction *m_showSidebarsAction;
TQPtrList<KAction> m_toolViewActions;
TQMap<ToolView*, KAction*> m_toolToAction;
KActionMenu *m_toolMenu;
TDEToggleAction *m_showSidebarsAction;
TQPtrList<TDEAction> m_toolViewActions;
TQMap<ToolView*, TDEAction*> m_toolToAction;
TDEActionMenu *m_toolMenu;
};
class ToolView : public TQVBox

4
kate/app/katemwmodonhddialog.cpp
Unescape Escape View File

@ -43,7 +43,7 @@
class KateDocItem : public TQCheckListItem
{
public:
KateDocItem( Kate::Document *doc, const TQString &status, KListView *lv )
KateDocItem( Kate::Document *doc, const TQString &status, TDEListView *lv )
: TQCheckListItem( lv, doc->url().prettyURL(), CheckBox ),
document( doc )
{
@ -89,7 +89,7 @@ KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, TQWidget *parent, cons
lo1->setStretchFactor( t, 1000 );
// document list
lvDocuments = new KListView( w );
lvDocuments = new TDEListView( w );
lvDocuments->addColumn( i18n("Filename") );
lvDocuments->addColumn( i18n("Status on Disk") );
lvDocuments->setSelectionMode( TQListView::Single );

2
kate/app/katemwmodonhddialog.h
Unescape Escape View File

@ -52,7 +52,7 @@ class KateMwModOnHdDialog : public KDialogBase
private:
enum Action { Ignore, Overwrite, Reload };
void handleSelected( int action );
class KListView *lvDocuments;
class TDEListView *lvDocuments;
class TQPushButton *btnDiff;
class KTempFile *m_tmpfile;
};

2
kate/app/katesavemodifieddialog.cpp
Unescape Escape View File

@ -140,7 +140,7 @@ KateSaveModifiedDialog::KateSaveModifiedDialog(TQWidget *parent, TQPtrList<Kate:
TQVBox *box=makeVBoxMainWidget();
new KActiveLabel(i18n("<qt>The following documents have been modified. Do you want to save them before closing?</qt>"),box);
m_list=new KListView(box);
m_list=new TDEListView(box);
m_list->addColumn(i18n("Title"));
m_list->addColumn(i18n("Location"));
m_list->setRootIsDecorated(true);

4
kate/app/katesavemodifieddialog.h
Unescape Escape View File

@ -23,7 +23,7 @@
#include <kate/document.h>
class TQListViewItem;
class KListView;
class TDEListView;
class KateSaveModifiedDialog: public KDialogBase {
Q_OBJECT
@ -42,7 +42,7 @@ protected slots:
private:
TQListViewItem *m_projectRoot;
TQListViewItem *m_documentRoot;
KListView *m_list;
TDEListView *m_list;
};
#endif

10
kate/app/katesession.cpp
Unescape Escape View File

@ -599,7 +599,7 @@ void KateSessionManager::sessionManage ()
class KateSessionChooserItem : public TQListViewItem
{
public:
KateSessionChooserItem (KListView *lv, KateSession::Ptr s)
KateSessionChooserItem (TDEListView *lv, KateSession::Ptr s)
: TQListViewItem (lv, s->sessionName())
, session (s)
{
@ -638,7 +638,7 @@ KateSessionChooser::KateSessionChooser (TQWidget *parent, const TQString &lastSe
TQVBox *vb = new TQVBox (hb);
vb->setSpacing (KDialog::spacingHint());
m_sessions = new KListView (vb);
m_sessions = new TDEListView (vb);
m_sessions->addColumn (i18n("Session Name"));
m_sessions->addColumn (i18n("Open Documents"));
m_sessions->setResizeMode (TQListView::AllColumns);
@ -728,7 +728,7 @@ KateSessionOpenDialog::KateSessionOpenDialog (TQWidget *parent)
TQVBox *vb = new TQVBox (hb);
m_sessions = new KListView (vb);
m_sessions = new TDEListView (vb);
m_sessions->addColumn (i18n("Session Name"));
m_sessions->addColumn (i18n("Open Documents"));
m_sessions->setResizeMode (TQListView::AllColumns);
@ -792,7 +792,7 @@ KateSessionManageDialog::KateSessionManageDialog (TQWidget *parent)
TQHBox *hb = new TQHBox (page);
hb->setSpacing (KDialog::spacingHint());
m_sessions = new KListView (hb);
m_sessions = new TDEListView (hb);
m_sessions->addColumn (i18n("Session Name"));
m_sessions->addColumn (i18n("Open Documents"));
m_sessions->setResizeMode (TQListView::AllColumns);
@ -889,7 +889,7 @@ void KateSessionManageDialog::updateSessionList ()
KateSessionsAction::KateSessionsAction(const TQString& text, TQObject* parent, const char* name )
: KActionMenu(text, parent, name)
: TDEActionMenu(text, parent, name)
{
connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
}

10
kate/app/katesession.h
Unescape Escape View File

@ -32,7 +32,7 @@
class KateSessionManager;
class KDirWatch;
class KListView;
class TDEListView;
class KPushButton;
class TQCheckBox;
@ -326,7 +326,7 @@ class KateSessionChooser : public KDialogBase
void selectionChanged ();
private:
KListView *m_sessions;
TDEListView *m_sessions;
TQCheckBox *m_useLast;
};
@ -357,7 +357,7 @@ class KateSessionOpenDialog : public KDialogBase
void slotUser2 ();
private:
KListView *m_sessions;
TDEListView *m_sessions;
};
class KateSessionManageDialog : public KDialogBase
@ -396,12 +396,12 @@ class KateSessionManageDialog : public KDialogBase
void updateSessionList ();
private:
KListView *m_sessions;
TDEListView *m_sessions;
KPushButton *m_rename;
KPushButton *m_del;
};
class KateSessionsAction : public KActionMenu
class KateSessionsAction : public TDEActionMenu
{
Q_OBJECT

24
kate/app/kateviewmanager.cpp
Unescape Escape View File

@ -89,52 +89,52 @@ KateViewManager::~KateViewManager ()
void KateViewManager::setupActions ()
{
KAction *a;
TDEAction *a;
/**
* tabbing
*/
a=new KAction ( i18n("New Tab"),"tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTab()),
a=new TDEAction ( i18n("New Tab"),"tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTab()),
m_mainWindow->actionCollection(), "view_new_tab" );
m_closeTab = new KAction ( i18n("Close Current Tab"),"tab_remove",0,TQT_TQOBJECT(this),TQT_SLOT(slotCloseTab()),
m_closeTab = new TDEAction ( i18n("Close Current Tab"),"tab_remove",0,TQT_TQOBJECT(this),TQT_SLOT(slotCloseTab()),
m_mainWindow->actionCollection(),"view_close_tab");
m_activateNextTab
= new KAction( i18n( "Activate Next Tab" ),
TQApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(),
= new TDEAction( i18n( "Activate Next Tab" ),
TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(),
TQT_TQOBJECT(this), TQT_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" );
m_activatePrevTab
= new KAction( i18n( "Activate Previous Tab" ),
TQApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(),
= new TDEAction( i18n( "Activate Previous Tab" ),
TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(),
TQT_TQOBJECT(this), TQT_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" );
/**
* view splitting
*/
a=new KAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT(
a=new TDEAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT(
slotSplitViewSpaceVert() ), m_mainWindow->actionCollection(), "view_split_vert");
a->setWhatsThis(i18n("Split the currently active view vertically into two views."));
a=new KAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT(
a=new TDEAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT(
slotSplitViewSpaceHoriz() ), m_mainWindow->actionCollection(), "view_split_horiz");
a->setWhatsThis(i18n("Split the currently active view horizontally into two views."));
m_closeView = new KAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this),
m_closeView = new TDEAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this),
TQT_SLOT( slotCloseCurrentViewSpace() ), m_mainWindow->actionCollection(),
"view_close_current_space" );
m_closeView->setWhatsThis(i18n("Close the currently active splitted view"));
goNext=new KAction(i18n("Next View"),Key_F8,TQT_TQOBJECT(this),
goNext=new TDEAction(i18n("Next View"),Key_F8,TQT_TQOBJECT(this),
TQT_SLOT(activateNextView()),m_mainWindow->actionCollection(),"go_next");
goNext->setWhatsThis(i18n("Make the next split view the active one."));
goPrev=new KAction(i18n("Previous View"),SHIFT+Key_F8, TQT_TQOBJECT(this), TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev");
goPrev=new TDEAction(i18n("Previous View"),SHIFT+Key_F8, TQT_TQOBJECT(this), TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev");
goPrev->setWhatsThis(i18n("Make the previous split view the active one."));

14
kate/app/kateviewmanager.h
Unescape Escape View File

@ -32,7 +32,7 @@ class KateMainWindow;
class KateViewSpaceContainer;
class TDEConfig;
class KAction;
class TDEAction;
class TQToolButton;
@ -143,12 +143,12 @@ class KateViewManager : public TQObject
bool m_init;
TQToolButton *m_closeTabButton;
KAction *m_closeView;
KAction *m_closeTab;
KAction *m_activateNextTab;
KAction *m_activatePrevTab;
KAction *goNext;
KAction *goPrev;
TDEAction *m_closeView;
TDEAction *m_closeTab;
TDEAction *m_activateNextTab;
TDEAction *m_activatePrevTab;
TDEAction *goNext;
TDEAction *goPrev;
};
#endif

2
kate/app/kateviewspace.cpp
Unescape Escape View File

@ -397,7 +397,7 @@ void KateVSStatusBar::modifiedChanged()
void KateVSStatusBar::showMenu()
{
KMainWindow* mainWindow = static_cast<KMainWindow*>( topLevelWidget() );
TDEMainWindow* mainWindow = static_cast<TDEMainWindow*>( topLevelWidget() );
TQPopupMenu* menu = static_cast<TQPopupMenu*>( mainWindow->factory()->container("viewspace_popup", mainWindow ) );
if (menu)

4
kate/app/kbookmarkhandler.cpp
Unescape Escape View File

@ -35,7 +35,7 @@
#include "kbookmarkhandler.moc"
KBookmarkHandler::KBookmarkHandler( KateFileSelector *parent, KPopupMenu* kpopupmenu )
KBookmarkHandler::KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu* kpopupmenu )
: TQObject( parent, "KBookmarkHandler" ),
KBookmarkOwner(),
mParent( parent ),
@ -43,7 +43,7 @@ KBookmarkHandler::KBookmarkHandler( KateFileSelector *parent, KPopupMenu* kpopup
m_importStream( 0L )
{
if (!m_menu)
m_menu = new KPopupMenu( parent, "bookmark menu" );
m_menu = new TDEPopupMenu( parent, "bookmark menu" );
TQString file = locate( "data", "kate/fsbookmarks.xml" );
if ( file.isEmpty() )

10
kate/app/kbookmarkhandler.h
Unescape Escape View File

@ -25,24 +25,24 @@
class KateFileSelector;
class KActionMenu;
class TDEActionMenu;
class TQTextStream;
class KPopupMenu;
class TDEPopupMenu;
class KBookmarkHandler : public TQObject, public KBookmarkOwner
{
Q_OBJECT
public:
KBookmarkHandler( KateFileSelector *parent, KPopupMenu *kpopupmenu=0 );
KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu *kpopupmenu=0 );
~KBookmarkHandler();
// KBookmarkOwner interface:
virtual void openBookmarkURL( const TQString& url ) { emit openURL( url ); }
virtual TQString currentURL() const;
KPopupMenu *menu() const { return m_menu; }
TDEPopupMenu *menu() const { return m_menu; }
signals:
void openURL( const TQString& url );
@ -60,7 +60,7 @@ protected:
private:
KateFileSelector *mParent;
KPopupMenu *m_menu;
TDEPopupMenu *m_menu;
KBookmarkMenu *m_bookmarkMenu;
TQTextStream *m_importStream;

12
kate/app/kwritemain.cpp
Unescape Escape View File

@ -150,11 +150,11 @@ void KWrite::setupActions()
actionCollection());
m_recentFiles->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again."));
KAction *a=new KAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newView()),
TDEAction *a=new TDEAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newView()),
actionCollection(), "view_new_view");
a->setWhatsThis(i18n("Create another view containing the current document"));
a=new KAction(i18n("Choose Editor Component..."),0,TQT_TQOBJECT(this),TQT_SLOT(changeEditor()),
a=new TDEAction(i18n("Choose Editor Component..."),0,TQT_TQOBJECT(this),TQT_SLOT(changeEditor()),
actionCollection(),"settings_choose_editor");
a->setWhatsThis(i18n("Override the system wide setting for the default editing component"));
@ -166,7 +166,7 @@ void KWrite::setupActions()
m_paShowStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
m_paShowStatusBar->setWhatsThis(i18n("Use this command to show or hide the view's statusbar"));
m_paShowPath = new KToggleAction(i18n("Sho&w Path"), 0, TQT_TQOBJECT(this), TQT_SLOT(newCaption()),
m_paShowPath = new TDEToggleAction(i18n("Sho&w Path"), 0, TQT_TQOBJECT(this), TQT_SLOT(newCaption()),
actionCollection(), "set_showPath");
m_paShowPath->setCheckedState(i18n("Hide Path"));
m_paShowPath->setWhatsThis(i18n("Show the complete document path in the window caption"));
@ -379,9 +379,9 @@ void KWrite::slotDropEvent( TQDropEvent *event )
void KWrite::slotEnableActions( bool enable )
{
TQValueList<KAction *> actions = actionCollection()->actions();
TQValueList<KAction *>::ConstIterator it = actions.begin();
TQValueList<KAction *>::ConstIterator end = actions.end();
TQValueList<TDEAction *> actions = actionCollection()->actions();
TQValueList<TDEAction *>::ConstIterator it = actions.begin();
TQValueList<TDEAction *>::ConstIterator end = actions.end();
for (; it != end; ++it )
(*it)->setEnabled( enable );

14
kate/app/kwritemain.h
Unescape Escape View File

@ -30,10 +30,10 @@
namespace KTextEditor { class EditorChooser; }
class KAction;
class KToggleAction;
class KSelectAction;
class KRecentFilesAction;
class TDEAction;
class TDEToggleAction;
class TDESelectAction;
class TDERecentFilesAction;
class KWrite : public KParts::MainWindow
{
@ -110,9 +110,9 @@ class KWrite : public KParts::MainWindow
private:
KTextEditor::View * m_view;
KRecentFilesAction * m_recentFiles;
KToggleAction * m_paShowPath;
KToggleAction * m_paShowStatusBar;
TDERecentFilesAction * m_recentFiles;
TDEToggleAction * m_paShowPath;
TDEToggleAction * m_paShowStatusBar;
TQString encoding;

8
kate/utils/listboxview.cpp
Unescape Escape View File

@ -26,7 +26,7 @@ namespace Kate {
// private storage
class ListboxViewPrivate {
public:
KListBox *listbox;
TDEListBox *listbox;
};
}
@ -35,14 +35,14 @@ Kate::ListboxView::ListboxView( TQWidget *parent, const char *name )
: Kate::DockViewBase( parent, name),
d( new Kate::ListboxViewPrivate)
{
d->listbox = new KListBox( this );
d->listbox = new TDEListBox( this );
}
Kate::ListboxView::ListboxView( const TQString &titlePrefix, const TQString &title, TQWidget *parent, const char *name )
: Kate::DockViewBase( titlePrefix, title, parent, name),
d( new Kate::ListboxViewPrivate)
{
d->listbox = new KListBox( this );
d->listbox = new TDEListBox( this );
}
Kate::ListboxView::~ListboxView()
@ -50,7 +50,7 @@ Kate::ListboxView::~ListboxView()
delete d;
}
KListBox *Kate::ListboxView::listbox()
TDEListBox *Kate::ListboxView::listbox()
{
return d->listbox;
}

4
kate/utils/listboxview.h
Unescape Escape View File

@ -21,7 +21,7 @@
#include "dockviewbase.h"
class KListBox;
class TDEListBox;
namespace Kate
{
@ -33,7 +33,7 @@ class ListboxView : public DockViewBase {
ListboxView( const TQString &titlePrefix, const TQString &title, TQWidget *parent=0, const char *name=0 );
~ListboxView();
KListBox * listbox();
TDEListBox * listbox();
private:
class ListboxViewPrivate *d;

2
kcontrol/colors/colorscm.cpp
Unescape Escape View File

@ -145,7 +145,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
TQGroupBox *group = new TQVGroupBox( i18n("Color Scheme"), this );
topLayout->addWidget( group, 1, 0 );
sList = new KListBox( group );
sList = new TDEListBox( group );
mSchemeList = new KColorSchemeList();
readSchemeNames();
sList->setCurrentItem( 0 );

4
kcontrol/colors/colorscm.h
Unescape Escape View File

@ -25,7 +25,7 @@ class TQCheckBox;
class TQResizeEvent;
class KLineEdit;
class TQPalette;
class KListBox;
class TDEListBox;
class KColorButton;
class TDEConfig;
class KStdDirs;
@ -76,7 +76,7 @@ private:
TQSlider *sb;
TQComboBox *wcCombo;
TQPushButton *addBt, *removeBt, *importBt;
KListBox *sList;
TDEListBox *sList;
KColorSchemeList *mSchemeList;
TQString sCurrentScheme;

2
kcontrol/componentchooser/componentchooser_ui.ui
Unescape Escape View File

@ -97,7 +97,7 @@
</widget>
</vbox>
</widget>
<widget class="KListBox" row="0" column="0" rowspan="2" colspan="1">
<widget class="TDEListBox" row="0" column="0" rowspan="2" colspan="1">
<property name="name">
<cstring>ServiceChooser</cstring>
</property>

2
kcontrol/css/kcmcss.cpp
Unescape Escape View File

@ -47,7 +47,7 @@ CSSConfig::CSSConfig(TQWidget *parent, const char *name, const TQStringList &)
TQStringList fonts;
KFontChooser::getFontList(fonts, 0);
TDEFontChooser::getFontList(fonts, 0);
customDialog->fontFamily->insertStringList(fonts);
connect(configDialog->useDefault, TQT_SIGNAL(clicked()),

4
kcontrol/displayconfig/displayconfig.h
Unescape Escape View File

@ -41,8 +41,8 @@
#include "displayconfigbase.h"
class TDEConfig;
class KPopupMenu;
class KListViewItem;
class TDEPopupMenu;
class TDEListViewItem;
typedef TQMap< TQString, TQPtrList< SingleScreenData > > ScreenConfigurationMap;

2
kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
Unescape Escape View File

@ -168,7 +168,7 @@ Select the search engine to use for input boxes that provide automatic lookup se
</size>
</property>
</spacer>
<widget class="KListView" row="0" column="0" rowspan="4" colspan="2">
<widget class="TDEListView" row="0" column="0" rowspan="4" colspan="2">
<column>
<property name="text">
<string>Name</string>

26
kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
Unescape Escape View File

@ -69,7 +69,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
if ( cmd.contains( exp ) )
{
if (verbose)
kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
kdDebug() << "TDEShortURIFilter::isValidShortURL: " << cmd
<< " matches FQDN_PATTERN" << endl;
// bug 133687
@ -88,7 +88,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
if ( cmd.contains( exp ) )
{
if (verbose)
kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
kdDebug() << "TDEShortURIFilter::isValidShortURL: " << cmd
<< " matches IPv4_PATTERN" << endl;
return true;
}
@ -98,13 +98,13 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
if ( cmd.contains( exp ) )
{
if (verbose)
kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
kdDebug() << "TDEShortURIFilter::isValidShortURL: " << cmd
<< " matches IPv6_PATTERN" << endl;
return true;
}
if (verbose)
kdDebug() << "KShortURIFilter::isValidShortURL: '" << cmd
kdDebug() << "TDEShortURIFilter::isValidShortURL: '" << cmd
<< "' is not a short URL." << endl;
return false;
@ -134,15 +134,15 @@ static TQString removeArgs( const TQString& _cmd )
return cmd;
}
KShortURIFilter::KShortURIFilter( TQObject *parent, const char *name,
TDEShortURIFilter::TDEShortURIFilter( TQObject *parent, const char *name,
const TQStringList & /*args*/ )
:KURIFilterPlugin( parent, name ? name : "kshorturifilter", 1.0),
DCOPObject("KShortURIFilterIface")
DCOPObject("TDEShortURIFilterIface")
{
configure();
}
bool KShortURIFilter::filterURI( KURIFilterData& data ) const
bool TDEShortURIFilter::filterURI( KURIFilterData& data ) const
{
/*
* Here is a description of how the shortURI deals with the supplied
@ -533,23 +533,23 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
return false;
}
TDECModule* KShortURIFilter::configModule( TQWidget*, const char* ) const
TDECModule* TDEShortURIFilter::configModule( TQWidget*, const char* ) const
{
return 0; //new KShortURIOptions( parent, name );
return 0; //new TDEShortURIOptions( parent, name );
}
TQString KShortURIFilter::configName() const
TQString TDEShortURIFilter::configName() const
{
return i18n("&ShortURLs");
}
void KShortURIFilter::configure()
void TDEShortURIFilter::configure()
{
TDEConfig config( name() + QFL1("rc"), false, false );
m_bVerbose = config.readBoolEntry( "Verbose", false );
if ( m_bVerbose )
kdDebug() << "KShortURIFilter::configure: Config reload request..." << endl;
kdDebug() << "TDEShortURIFilter::configure: Config reload request..." << endl;
m_strDefaultProtocol = config.readEntry( "DefaultProtocol", QFL1("http://") );
EntryMap patterns = config.entryMap( QFL1("Pattern") );
@ -571,6 +571,6 @@ void KShortURIFilter::configure()
}
K_EXPORT_COMPONENT_FACTORY( libkshorturifilter,
KGenericFactory<KShortURIFilter>( "kcmkurifilt" ) )
KGenericFactory<TDEShortURIFilter>( "kcmkurifilt" ) )
#include "kshorturifilter.moc"

6
kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
Unescape Escape View File

@ -37,7 +37,7 @@ class TDEInstance;
* @author Dawit Alemayehu <adawit@kde.org>
* @author Malte Starostik <starosti@zedat.fu-berlin.de>
*/
class KShortURIFilter : public KURIFilterPlugin , public DCOPObject
class TDEShortURIFilter : public KURIFilterPlugin , public DCOPObject
{
K_DCOP
Q_OBJECT
@ -49,13 +49,13 @@ public:
* @param parent the parent of this class.
* @param name the internal name for this object.
*/
KShortURIFilter( TQObject *parent = 0, const char *name = 0,
TDEShortURIFilter( TQObject *parent = 0, const char *name = 0,
const TQStringList &args = TQStringList() );
/**
* Destructor
*/
virtual ~KShortURIFilter() {};
virtual ~TDEShortURIFilter() {};
/**
* Converts short URIs into fully qualified valid URIs

2
kcontrol/filetypes/filetypesview.cpp
Unescape Escape View File

@ -75,7 +75,7 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
TQWhatsThis::add( patternFilterLE, wtstr );
TQWhatsThis::add( patternFilterLBL, wtstr );
typesLV = new KListView(this);
typesLV = new TDEListView(this);
typesLV->setRootIsDecorated(true);
typesLV->setFullWidth(true);

4
kcontrol/filetypes/filetypesview.h
Unescape Escape View File

@ -10,7 +10,7 @@
#include "typeslistitem.h"
class TQLabel;
class KListView;
class TDEListView;
class TQListViewItem;
class TQListBox;
class TQPushButton;
@ -51,7 +51,7 @@ protected:
bool sync( TQValueList<TypesListItem *>& itemsModified );
private:
KListView *typesLV;
TDEListView *typesLV;
TQPushButton *m_removeTypeB;
TQWidgetStack * m_widgetStack;

2
kcontrol/filetypes/kserviceselectdlg.cpp
Unescape Escape View File

@ -33,7 +33,7 @@ KServiceSelectDlg::KServiceSelectDlg( const TQString& /*serviceType*/, const TQS
vbox->setSpacing( KDialog::spacingHint() );
new TQLabel( i18n( "Select service:" ), vbox );
m_listbox=new KListBox( vbox );
m_listbox=new TDEListBox( vbox );
// Can't make a TDETrader query since we don't have a servicetype to give,
// we want all services that are not applications.......

2
kcontrol/filetypes/kserviceselectdlg.h
Unescape Escape View File

@ -41,7 +41,7 @@ public:
*/
KService::Ptr service();
private:
KListBox * m_listbox;
TDEListBox * m_listbox;
};
#endif

36
kcontrol/fonts/fonts.cpp
Unescape Escape View File

@ -126,7 +126,7 @@ static const char *aa_vbgr_xpm[]={
static const char** aaPixmaps[]={ aa_rgb_xpm, aa_bgr_xpm, aa_vrgb_xpm, aa_vbgr_xpm };
/**** DLL Interface ****/
typedef KGenericFactory<KFonts, TQWidget> FontFactory;
typedef KGenericFactory<TDEFonts, TQWidget> FontFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_fonts, FontFactory("kcmfonts") )
/**** FontUseItem ****/
@ -140,13 +140,13 @@ FontUseItem::FontUseItem(
const TQFont &default_fnt,
bool f
)
: KFontRequester(parent, 0L, f),
: TDEFontRequester(parent, 0L, f),
_rcfile(rc),
_rcgroup(grp),
_rckey(key),
_default(default_fnt)
{
KAcceleratorManager::setNoAccel( this );
TDEAcceleratorManager::setNoAccel( this );
setTitle( name );
readFont( false );
}
@ -198,13 +198,13 @@ void FontUseItem::applyFontDiff( const TQFont &fnt, int fontDiffFlags )
{
TQFont _font( font() );
if (fontDiffFlags & KFontChooser::FontDiffSize) {
if (fontDiffFlags & TDEFontChooser::FontDiffSize) {
_font.setPointSize( fnt.pointSize() );
}
if (fontDiffFlags & KFontChooser::FontDiffFamily) {
if (fontDiffFlags & TDEFontChooser::FontDiffFamily) {
if (!isFixedOnly()) _font.setFamily( fnt.family() );
}
if (fontDiffFlags & KFontChooser::FontDiffStyle) {
if (fontDiffFlags & TDEFontChooser::FontDiffStyle) {
_font.setBold( fnt.bold() );
_font.setItalic( fnt.italic() );
_font.setUnderline( fnt.underline() );
@ -490,7 +490,7 @@ int FontAASettings::exec()
return i && changesMade;
}
/**** KFonts ****/
/**** TDEFonts ****/
static TQCString desktopConfigName()
{
@ -506,7 +506,7 @@ static TQCString desktopConfigName()
return name;
}
KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &)
: TDECModule(FontFactory::instance(), parent, name)
{
TQStringList nameGroupKeyRc;
@ -662,30 +662,30 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
load();
}
KFonts::~KFonts()
TDEFonts::~TDEFonts()
{
fontUseList.setAutoDelete(true);
fontUseList.clear();
}
void KFonts::fontSelected()
void TDEFonts::fontSelected()
{
emit changed(true);
}
void KFonts::defaults()
void TDEFonts::defaults()
{
load( true );
aaSettings->defaults();
}
void KFonts::load()
void TDEFonts::load()
{
load( false );
}
void KFonts::load( bool useDefaults )
void TDEFonts::load( bool useDefaults )
{
for ( uint i = 0; i < fontUseList.count(); i++ )
fontUseList.at( i )->readFont( useDefaults );
@ -708,7 +708,7 @@ void KFonts::load( bool useDefaults )
emit changed( useDefaults );
}
void KFonts::save()
void TDEFonts::save()
{
for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() )
@ -770,11 +770,11 @@ void KFonts::save()
}
void KFonts::slotApplyFontDiff()
void TDEFonts::slotApplyFontDiff()
{
TQFont font = TQFont(fontUseList.first()->font());
int fontDiffFlags = 0;
int ret = KFontDialog::getFontDiff(font,fontDiffFlags);
int ret = TDEFontDialog::getFontDiff(font,fontDiffFlags);
if (ret == KDialog::Accepted && fontDiffFlags)
{
@ -784,14 +784,14 @@ void KFonts::slotApplyFontDiff()
}
}
void KFonts::slotUseAntiAliasing()
void TDEFonts::slotUseAntiAliasing()
{
useAA = static_cast< AASetting >( cbAA->currentItem());
aaSettingsButton->setEnabled( cbAA->currentItem() == AAEnabled );
emit changed(true);
}
void KFonts::slotCfgAa()
void TDEFonts::slotCfgAa()
{
if(aaSettings->exec())
{

8
kcontrol/fonts/fonts.h
Unescape Escape View File

@ -22,7 +22,7 @@ class TQComboBox;
class KDoubleNumInput;
class FontAASettings;
class FontUseItem : public KFontRequester
class FontUseItem : public TDEFontRequester
{
Q_OBJECT
@ -89,13 +89,13 @@ private:
/**
* The Desktop/fonts tab in kcontrol.
*/
class KFonts : public TDECModule
class TDEFonts : public TDECModule
{
Q_OBJECT
public:
KFonts(TQWidget *parent, const char *name, const TQStringList &);
~KFonts();
TDEFonts(TQWidget *parent, const char *name, const TQStringList &);
~TDEFonts();
virtual void load();
virtual void load( bool useDefaults );

4
kcontrol/hwmanager/deviceiconview.cpp
Unescape Escape View File

@ -33,7 +33,7 @@
#include "deviceiconview.moc"
DeviceIconView::DeviceIconView(TQWidget * parent, const char * name)
: KListView(parent, name)
: TDEListView(parent, name)
{
setSorting(0, true);
addColumn(TQString::null);
@ -88,7 +88,7 @@ void DeviceIconView::keyPressEvent(TQKeyEvent *e)
}
}
else {
KListView::keyPressEvent(e);
TDEListView::keyPressEvent(e);
}
}

8
kcontrol/hwmanager/deviceiconview.h
Unescape Escape View File

@ -29,18 +29,18 @@
class ConfigModule;
class ConfigModuleList;
class DeviceIconItem : public KListViewItem
class DeviceIconItem : public TDEListViewItem
{
public:
DeviceIconItem(TQListViewItem *parent, const TQString& text, const TQPixmap& pm, TDEGenericDevice *d = 0)
: KListViewItem(parent, text)
: TDEListViewItem(parent, text)
, _tag(TQString::null)
, _device(d)
{
setPixmap(0, pm);
}
DeviceIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, TDEGenericDevice *d = 0)
: KListViewItem(parent, text)
: TDEListViewItem(parent, text)
, _tag(TQString::null)
, _device(d)
{
@ -59,7 +59,7 @@ private:
TDEGenericDevice *_device;
};
class DeviceIconView : public KListView
class DeviceIconView : public TDEListView
{
Q_OBJECT

4
kcontrol/hwmanager/hwmanager.h
Unescape Escape View File

@ -35,8 +35,8 @@
#include "deviceiconview.h"
class TDEConfig;
class KPopupMenu;
class KListViewItem;
class TDEPopupMenu;
class TDEListViewItem;
class TDEHWManager : public TDECModule, public DCOPObject
{

2
kcontrol/hwmanager/hwmanagerbase.ui
Unescape Escape View File

@ -58,7 +58,7 @@
<string>Filter by Name:</string>
</property>
</widget>
<widget class="KListViewSearchLine" row="2" column="1" colspan="3">
<widget class="TDEListViewSearchLine" row="2" column="1" colspan="3">
<property name="name">
<cstring>deviceFilter</cstring>
</property>

4
kcontrol/iccconfig/iccconfig.h
Unescape Escape View File

@ -32,8 +32,8 @@
#include "iccconfigbase.h"
class TDEConfig;
class KPopupMenu;
class KListViewItem;
class TDEPopupMenu;
class TDEListViewItem;
class KICCConfig : public TDECModule, public DCOPObject
{

2
kcontrol/icons/iconthemes.cpp
Unescape Escape View File

@ -77,7 +77,7 @@ IconThemesConfig::IconThemesConfig(TQWidget *parent, const char *name)
lh2->addStretch(10);
m_iconThemes=new KListView(this,"IconThemeList");
m_iconThemes=new TDEListView(this,"IconThemeList");
m_iconThemes->addColumn(i18n("Name"));
m_iconThemes->addColumn(i18n("Description"));
m_iconThemes->setAllColumnsShowFocus( true );

2
kcontrol/icons/iconthemes.h
Unescape Escape View File

@ -58,7 +58,7 @@ protected slots:
private:
TQListViewItem *iconThemeItem(const TQString &name);
KListView *m_iconThemes;
TDEListView *m_iconThemes;
TQPushButton *m_removeButton;
TQLabel *m_previewExec;

12
kcontrol/input/core/themepage.cpp
Unescape Escape View File

@ -60,7 +60,7 @@ ThemePage::ThemePage( TQWidget* parent, const char* name )
new TQLabel( i18n("Select the cursor theme you want to use:"), this );
// Create the theme list view
listview = new KListView( this );
listview = new TDEListView( this );
listview->setFullWidth( true );
listview->setAllColumnsShowFocus( true );
listview->addColumn( i18n("Name") );
@ -143,24 +143,24 @@ void ThemePage::defaults()
void ThemePage::insertThemes()
{
KListViewItem *item;
TDEListViewItem *item;
item = new KListViewItem( listview, i18n("Small black"),
item = new TDEListViewItem( listview, i18n("Small black"),
i18n("Small black cursors"), "SmallBlack" );
item->setPixmap( 0, TQPixmap( arrow_small_black_xpm ) );
listview->insertItem( item );
item = new KListViewItem( listview, i18n("Large black"),
item = new TDEListViewItem( listview, i18n("Large black"),
i18n("Large black cursors"), "LargeBlack" );
item->setPixmap( 0, TQPixmap( arrow_large_black_xpm ) );
listview->insertItem( item );
item = new KListViewItem( listview, i18n("Small white"),
item = new TDEListViewItem( listview, i18n("Small white"),
i18n("Small white cursors"), "SmallWhite" );
item->setPixmap( 0, TQPixmap( arrow_small_white_xpm ) );
listview->insertItem( item );
item = new KListViewItem( listview, i18n("Large white"),
item = new TDEListViewItem( listview, i18n("Large white"),
i18n("Large white cursors"), "LargeWhite" );
item->setPixmap( 0, TQPixmap( arrow_large_white_xpm ) );
listview->insertItem( item );

4
kcontrol/input/core/themepage.h
Unescape Escape View File

@ -21,7 +21,7 @@
#include <tqwidget.h>
class KListView;
class TDEListView;
class TQListViewItem;
class ThemePage : public TQWidget
@ -49,7 +49,7 @@ class ThemePage : public TQWidget
void insertThemes();
void fixCursorFile();
KListView *listview;
TDEListView *listview;
TQString currentTheme, selectedTheme;
};

10
kcontrol/input/xcursor/themepage.cpp
Unescape Escape View File

@ -94,7 +94,7 @@ ThemePage::ThemePage( TQWidget* parent, const char* name )
preview = new PreviewWidget( new TQHBox( this ) );
// Create the theme list view
listview = new KListView( this );
listview = new TDEListView( this );
listview->setFullWidth( true );
listview->setAllColumnsShowFocus( true );
listview->addColumn( i18n("Name") );
@ -374,7 +374,7 @@ void ThemePage::insertTheme( const TQString &path )
delete listview->findItem( dirName, DirColumn );
// Create the listview item and insert it into the list.
KListViewItem *item = new KListViewItem( listview, name, desc, /*hidden*/ dirName );
TDEListViewItem *item = new TDEListViewItem( listview, name, desc, /*hidden*/ dirName );
item->setPixmap( NameColumn, createIcon( dirName, sample ) );
listview->insertItem( item );
}
@ -529,7 +529,7 @@ void ThemePage::insertThemes()
themeInfo.insert( *it, info );
// Create the listview item and insert it into the list.
KListViewItem *item = new KListViewItem( listview, name, desc, /*hidden*/ *it );
TDEListViewItem *item = new TDEListViewItem( listview, name, desc, /*hidden*/ *it );
item->setPixmap( NameColumn, createIcon( *it, sample ) );
listview->insertItem( item );
}
@ -541,9 +541,9 @@ void ThemePage::insertThemes()
// Sort the theme list
listview->sort();
KListViewItem *item = new KListViewItem( listview, ' ' + i18n( "No theme" ), i18n( "The old classic X cursors") , /*hidden*/ "none" );
TDEListViewItem *item = new TDEListViewItem( listview, ' ' + i18n( "No theme" ), i18n( "The old classic X cursors") , /*hidden*/ "none" );
listview->insertItem( item );
item = new KListViewItem( listview, ' ' + i18n( "System theme" ), i18n( "Do not change cursor theme") , /*hidden*/ "system" );
item = new TDEListViewItem( listview, ' ' + i18n( "System theme" ), i18n( "Do not change cursor theme") , /*hidden*/ "system" );
listview->insertItem( item );
// no ThemeInfo object for this one
}

4
kcontrol/input/xcursor/themepage.h
Unescape Escape View File

@ -22,7 +22,7 @@
#include <tqdict.h>
class KListView;
class TDEListView;
class TQString;
class PreviewWidget;
class TQStringList;
@ -62,7 +62,7 @@ class ThemePage : public TQWidget
void insertThemes();
TQPixmap createIcon( const TQString &, const TQString & ) const;
KListView *listview;
TDEListView *listview;
PreviewWidget *preview;
TQPushButton *installButton, *removeButton;
TQString selectedTheme;

2
kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
Unescape Escape View File

@ -58,7 +58,7 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStrin
TQLabel* label=new TQLabel(i18n("Available IO slaves:"),this);
TQHBox *hbox=new TQHBox(this);
m_ioslavesLb=new KListBox(hbox);
m_ioslavesLb=new TDEListBox(hbox);
m_ioslavesLb->setMinimumSize(fontMetrics().width("blahfaselwhatever----"),10);
connect( m_ioslavesLb, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ), TQT_SLOT( showInfo( TQListBoxItem * ) ) );
//TODO make something useful after 2.1 is released

2
kcontrol/ioslaveinfo/kcmioslaveinfo.h
Unescape Escape View File

@ -45,7 +45,7 @@ public:
KCMIOSlaveInfo(TQWidget *parent = 0L, const char *name = 0L, const TQStringList &lits=TQStringList() );
protected:
KListBox *m_ioslavesLb;
TDEListBox *m_ioslavesLb;
KTextBrowser *m_info;
TQCString helpData;
TDEIO::Job *m_tfj;

4
kcontrol/kcontrol/moduleiconview.cpp
Unescape Escape View File

@ -35,7 +35,7 @@
ModuleIconView::ModuleIconView(ConfigModuleList *list, TQWidget * parent, const char * name)
: KListView(parent, name)
: TDEListView(parent, name)
, _path(KCGlobal::baseGroup())
, _modules(list)
{
@ -155,7 +155,7 @@ void ModuleIconView::keyPressEvent(TQKeyEvent *e)
}
else
{
KListView::keyPressEvent(e);
TDEListView::keyPressEvent(e);
}
}

6
kcontrol/kcontrol/moduleiconview.h
Unescape Escape View File

@ -25,12 +25,12 @@
class ConfigModule;
class ConfigModuleList;
class ModuleIconItem : public KListViewItem
class ModuleIconItem : public TDEListViewItem
{
public:
ModuleIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, ConfigModule *m = 0)
: KListViewItem(parent, text)
: TDEListViewItem(parent, text)
, _tag(TQString::null)
, _module(m)
{
@ -54,7 +54,7 @@ private:
ConfigModule *_module;
};
class ModuleIconView : public KListView
class ModuleIconView : public TDEListView
{
Q_OBJECT

6
kcontrol/kcontrol/modulemenu.cpp
Unescape Escape View File

@ -41,7 +41,7 @@ that is intentional :-]
ModuleMenu::ModuleMenu(ConfigModuleList *list, TQWidget * parent, const char * name)
: KPopupMenu(parent, name)
: TDEPopupMenu(parent, name)
, _modules(list)
{
// use large id's to start with...
@ -52,7 +52,7 @@ ModuleMenu::ModuleMenu(ConfigModuleList *list, TQWidget * parent, const char * n
connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int)));
}
void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath)
{
TQStringList subMenus = _modules->submenus(parentPath);
for(TQStringList::ConstIterator it = subMenus.begin();
@ -64,7 +64,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
continue;
// create new menu
KPopupMenu *menu = new KPopupMenu(parentMenu);
TDEPopupMenu *menu = new TDEPopupMenu(parentMenu);
connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int)));
// Item names may contain ampersands. To avoid them being converted to

4
kcontrol/kcontrol/modulemenu.h
Unescape Escape View File

@ -38,7 +38,7 @@ class ConfigModule;
class ConfigModuleList;
class ModuleMenu : public KPopupMenu
class ModuleMenu : public TDEPopupMenu
{
Q_OBJECT
@ -52,7 +52,7 @@ private slots:
void moduleSelected(int id);
protected:
void fill(KPopupMenu *parentMenu, const TQString &parentPath);
void fill(TDEPopupMenu *parentMenu, const TQString &parentPath);
private:
int id;

4
kcontrol/kcontrol/moduletreeview.cpp
Unescape Escape View File

@ -72,7 +72,7 @@ private:
};
ModuleTreeView::ModuleTreeView(ConfigModuleList *list, TQWidget * parent, const char * name)
: KListView(parent, name)
: TDEListView(parent, name)
, _modules(list)
{
addColumn(TQString::null);
@ -262,7 +262,7 @@ void ModuleTreeView::keyPressEvent(TQKeyEvent *e)
slotItemSelected(currentItem());
}
else
KListView::keyPressEvent(e);
TDEListView::keyPressEvent(e);
}

2
kcontrol/kcontrol/moduletreeview.h
Unescape Escape View File

@ -64,7 +64,7 @@ private:
TQString _icon;
};
class ModuleTreeView : public KListView
class ModuleTreeView : public TDEListView
{
Q_OBJECT

4
kcontrol/kcontrol/searchwidget.cpp
Unescape Escape View File

@ -74,14 +74,14 @@ SearchWidget::SearchWidget(TQWidget *parent , const char *name)
TQVBoxLayout * l = new TQVBoxLayout(this, 0, 2);
// keyword list
_keyList = new KListBox(this);
_keyList = new TDEListBox(this);
TQLabel *keyl = new TQLabel(_keyList, i18n("&Keywords:"), this);
l->addWidget(keyl);
l->addWidget(_keyList);
// result list
_resultList = new KListBox(this);
_resultList = new TDEListBox(this);
TQLabel *resultl = new TQLabel(_resultList, i18n("&Results:"), this);
l->addWidget(resultl);

4
kcontrol/kcontrol/searchwidget.h
Unescape Escape View File

@ -28,7 +28,7 @@
#include "modules.h"
class KListBox;
class TDEListBox;
class KLineEdit;
class TQListBoxItem;
@ -71,7 +71,7 @@ protected slots:
void slotModuleClicked(TQListBoxItem *item);
private:
KListBox *_keyList, *_resultList;
TDEListBox *_keyList, *_resultList;
TQPtrList<KeywordListEntry> _keywords;
};

16
kcontrol/kcontrol/toplevel.cpp
Unescape Escape View File

@ -49,7 +49,7 @@
#include "toplevel.moc"
TopLevel::TopLevel(const char* name)
: KMainWindow( 0, name, (WFlags)WStyle_ContextHelp )
: TDEMainWindow( 0, name, (WFlags)WStyle_ContextHelp )
, _active(0), dummyAbout(0)
{
setCaption(TQString::null);
@ -237,37 +237,37 @@ void TopLevel::setupActions()
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
icon_view = new KRadioAction
icon_view = new TDERadioAction
(i18n("&Icon View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateIconView()),
actionCollection(), "activate_iconview");
icon_view->setExclusiveGroup( "viewmode" );
tree_view = new KRadioAction
tree_view = new TDERadioAction
(i18n("&Tree View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateTreeView()),
actionCollection(), "activate_treeview");
tree_view->setExclusiveGroup( "viewmode" );
icon_small = new KRadioAction
icon_small = new TDERadioAction
(i18n("&Small"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateSmallIcons()),
actionCollection(), "activate_smallicons");
icon_small->setExclusiveGroup( "iconsize" );
icon_medium = new KRadioAction
icon_medium = new TDERadioAction
(i18n("&Medium"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateMediumIcons()),
actionCollection(), "activate_mediumicons");
icon_medium->setExclusiveGroup( "iconsize" );
icon_large = new KRadioAction
icon_large = new TDERadioAction
(i18n("&Large"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateLargeIcons()),
actionCollection(), "activate_largeicons");
icon_large->setExclusiveGroup( "iconsize" );
icon_huge = new KRadioAction
icon_huge = new TDERadioAction
(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, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), actionCollection(), "help_about_module");
about_module = new TDEAction(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,

12
kcontrol/kcontrol/toplevel.h
Unescape Escape View File

@ -28,8 +28,8 @@
class TQSplitter;
class TQWidgetStack;
class KToggleAction;
class KAction;
class TDEToggleAction;
class TDEAction;
class DockContainer;
class IndexWidget;
@ -39,7 +39,7 @@ class ConfigModule;
class ConfigModuleList;
class ModuleTitle;
class TopLevel : public KMainWindow
class TopLevel : public TDEMainWindow
{
Q_OBJECT
@ -84,9 +84,9 @@ private:
DockContainer *_dock;
ModuleTitle *_title;
KToggleAction *tree_view, *icon_view;
KToggleAction *icon_small, *icon_medium, *icon_large, *icon_huge;
KAction *report_bug, *about_module;
TDEToggleAction *tree_view, *icon_view;
TDEToggleAction *icon_small, *icon_medium, *icon_large, *icon_huge;
TDEAction *report_bug, *about_module;
IndexWidget *_index;
SearchWidget *_search;

4
kcontrol/kded/kcmkded.cpp
Unescape Escape View File

@ -75,7 +75,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
"cannot manipulate these services."));
lay->addWidget( gb );
_lvLoD = new KListView( gb );
_lvLoD = new TDEListView( gb );
_lvLoD->addColumn(i18n("Service"));
_lvLoD->addColumn(i18n("Description"));
_lvLoD->addColumn(i18n("Status"));
@ -88,7 +88,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
"Be careful with deactivation of unknown services."));
lay->addWidget( gb );
_lvStartup = new KListView( gb );
_lvStartup = new TDEListView( gb );
_lvStartup->addColumn(i18n("Use"));
_lvStartup->addColumn(i18n("Service"));
_lvStartup->addColumn(i18n("Description"));

6
kcontrol/kded/kcmkded.h
Unescape Escape View File

@ -23,7 +23,7 @@
#include <tdecmodule.h>
class KListView;
class TDEListView;
class TQStringList;
class TQPushButton;
@ -53,8 +53,8 @@ protected slots:
void setAutoloadEnabled(TDEConfig *config, const TQString &filename, bool b);
private:
KListView *_lvLoD;
KListView *_lvStartup;
TDEListView *_lvLoD;
TDEListView *_lvStartup;
TQPushButton *_pbStart;
TQPushButton *_pbStop;

6
kcontrol/keys/commandShortcuts.cpp
Unescape Escape View File

@ -121,8 +121,8 @@ void CommandShortcutsModule::initGUI()
"to the currently selected command."));
buttonLayout->addSpacing(KDialog::spacingHint() * 2);
buttonLayout->addWidget(m_shortcutButton);
connect(m_shortcutButton, TQT_SIGNAL(capturedShortcut(const KShortcut&)),
this, TQT_SLOT(shortcutChanged(const KShortcut&)));
connect(m_shortcutButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)),
this, TQT_SLOT(shortcutChanged(const TDEShortcut&)));
connect(m_customRadio, TQT_SIGNAL(toggled(bool)), m_shortcutButton, TQT_SLOT(setEnabled(bool)));
connect(m_noneRadio, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shortcutRadioToggled(bool)));
buttonLayout->addStretch(1);
@ -170,7 +170,7 @@ void CommandShortcutsModule::shortcutRadioToggled(bool remove)
}
}
void CommandShortcutsModule::shortcutChanged(const KShortcut& shortcut)
void CommandShortcutsModule::shortcutChanged(const TDEShortcut& shortcut)
{
AppTreeItem *item = static_cast<AppTreeItem*>(m_tree->currentItem());
if (!item || item->isDirectory())

2
kcontrol/keys/commandShortcuts.h
Unescape Escape View File

@ -55,7 +55,7 @@ class CommandShortcutsModule : public TQWidget
protected slots:
void commandSelected(const TQString&, const TQString &, bool);
void shortcutChanged(const KShortcut& shortcut);
void shortcutChanged(const TDEShortcut& shortcut);
void shortcutRadioToggled(bool remove);
void commandDoubleClicked(TQListViewItem *item, const TQPoint &, int);
void launchMenuEditor();

104
kcontrol/keys/kaccelaction.h
Unescape Escape View File

@ -30,30 +30,30 @@
#include <kshortcut.h>
class KAccelBase;
class TDEAccelBase;
class TQObject;
class TDEConfig;
class TDEConfigBase;
/*
KAccelAction holds information an a given action, such as "Run Command"
TDEAccelAction holds information an a given action, such as "Run Command"
1) KAccelAction = "Run Command"
1) TDEAccelAction = "Run Command"
Default3 = "Alt+F2"
Default4 = "Meta+Enter;Alt+F2"
1) KShortcut = "Meta+Enter"
1) TDEShortcut = "Meta+Enter"
1) KKeySequence = "Meta+Enter"
1) KKey = "Meta+Enter"
1) Meta+Enter
2) Meta+Keypad_Enter
2) KShortcut = "Alt+F2"
2) TDEShortcut = "Alt+F2"
1) KKeySequence = "Alt+F2"
1) Alt+F2
2) KAccelAction = "Something"
2) TDEAccelAction = "Something"
Default3 = ""
Default4 = ""
1) KShortcut = "Meta+X,Asterisk"
1) TDEShortcut = "Meta+X,Asterisk"
1) KKeySequence = "Meta+X,Asterisk"
1) KKey = "Meta+X"
1) Meta+X
@ -63,35 +63,35 @@ class TDEConfigBase;
*/
//---------------------------------------------------------------------
// KAccelAction
// TDEAccelAction
//---------------------------------------------------------------------
class KAccelAction
class TDEAccelAction
{
public:
KAccelAction();
KAccelAction( const KAccelAction& );
KAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
const KShortcut& cutDef3, const KShortcut& cutDef4,
TDEAccelAction();
TDEAccelAction( const TDEAccelAction& );
TDEAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled );
~KAccelAction();
~TDEAccelAction();
void clear();
bool init( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
const KShortcut& cutDef3, const KShortcut& cutDef4,
const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled );
KAccelAction& operator=( const KAccelAction& );
TDEAccelAction& operator=( const TDEAccelAction& );
const TQString& name() const { return m_sName; }
const TQString& label() const { return m_sLabel; }
const TQString& whatsThis() const { return m_sWhatsThis; }
const KShortcut& shortcut() const { return m_cut; }
const KShortcut& shortcutDefault() const;
const KShortcut& shortcutDefault3() const { return m_cutDefault3; }
const KShortcut& shortcutDefault4() const { return m_cutDefault4; }
const TDEShortcut& shortcut() const { return m_cut; }
const TDEShortcut& shortcutDefault() const;
const TDEShortcut& shortcutDefault3() const { return m_cutDefault3; }
const TDEShortcut& shortcutDefault4() const { return m_cutDefault4; }
const TQObject* objSlotPtr() const { return m_pObjSlot; }
const char* methodSlotPtr() const { return m_psMethodSlot; }
bool isConfigurable() const { return m_bConfigurable; }
@ -100,7 +100,7 @@ class KAccelAction
void setName( const TQString& );
void setLabel( const TQString& );
void setWhatsThis( const TQString& );
bool setShortcut( const KShortcut& rgCuts );
bool setShortcut( const TDEShortcut& rgCuts );
void setSlot( const TQObject* pObjSlot, const char* psMethodSlot );
void setConfigurable( bool );
void setEnabled( bool );
@ -123,8 +123,8 @@ class KAccelAction
TQString m_sName,
m_sLabel,
m_sWhatsThis;
KShortcut m_cut;
KShortcut m_cutDefault3, m_cutDefault4;
TDEShortcut m_cut;
TDEShortcut m_cutDefault3, m_cutDefault4;
const TQObject* m_pObjSlot;
const char* m_psMethodSlot;
bool m_bConfigurable,
@ -137,43 +137,43 @@ class KAccelAction
private:
static int g_bUseFourModifierKeys;
class KAccelActionPrivate* d;
class TDEAccelActionPrivate* d;
friend class KAccelActions;
friend class KAccelBase;
friend class TDEAccelActions;
friend class TDEAccelBase;
};
//---------------------------------------------------------------------
// KAccelActions
// TDEAccelActions
//---------------------------------------------------------------------
class KAccelActions
class TDEAccelActions
{
public:
KAccelActions();
KAccelActions( const KAccelActions& );
virtual ~KAccelActions();
TDEAccelActions();
TDEAccelActions( const TDEAccelActions& );
virtual ~TDEAccelActions();
void clear();
bool init( const KAccelActions& );
bool init( const TDEAccelActions& );
bool init( TDEConfigBase& config, const TQString& sGroup );
void updateShortcuts( KAccelActions& );
void updateShortcuts( TDEAccelActions& );
int actionIndex( const TQString& sAction ) const;
KAccelAction* actionPtr( uint );
const KAccelAction* actionPtr( uint ) const;
KAccelAction* actionPtr( const TQString& sAction );
const KAccelAction* actionPtr( const TQString& sAction ) const;
KAccelAction* actionPtr( KKeySequence cut );
KAccelAction& operator []( uint );
const KAccelAction& operator []( uint ) const;
KAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
TDEAccelAction* actionPtr( uint );
const TDEAccelAction* actionPtr( uint ) const;
TDEAccelAction* actionPtr( const TQString& sAction );
const TDEAccelAction* actionPtr( const TQString& sAction ) const;
TDEAccelAction* actionPtr( KKeySequence cut );
TDEAccelAction& operator []( uint );
const TDEAccelAction& operator []( uint ) const;
TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4,
const TQObject* pObjSlot = 0, const char* psMethodSlot = 0,
bool bConfigurable = true, bool bEnabled = true );
KAccelAction* insert( const TQString& sName, const TQString& sLabel );
TDEAccelAction* insert( const TQString& sName, const TQString& sLabel );
bool remove( const TQString& sAction );
bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
@ -185,21 +185,21 @@ class KAccelActions
uint count() const;
protected:
KAccelBase* m_pKAccelBase;
KAccelAction** m_prgActions;
TDEAccelBase* m_pTDEAccelBase;
TDEAccelAction** m_prgActions;
uint m_nSizeAllocated, m_nSize;
void resize( uint );
void insertPtr( KAccelAction* );
void insertPtr( TDEAccelAction* );
private:
class KAccelActionsPrivate* d;
class TDEAccelActionsPrivate* d;
KAccelActions( KAccelBase* );
void initPrivate( KAccelBase* );
KAccelActions& operator =( KAccelActions& );
TDEAccelActions( TDEAccelBase* );
void initPrivate( TDEAccelBase* );
TDEAccelActions& operator =( TDEAccelActions& );
friend class KAccelBase;
friend class TDEAccelBase;
};
#endif // _KACCELACTION_H

40
kcontrol/keys/keyconfig.cpp
Unescape Escape View File

@ -57,17 +57,17 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
kdDebug(125) << "KKeyModule::init() - Get default key bindings." << endl;
if ( KeyType == "global" ) {
KAccelActions* keys = &actions;
TDEAccelActions* keys = &actions;
// see also KKeyModule::init() below !!!
#define NOSLOTS
#define KShortcuts KAccelShortcuts
#define TDEShortcuts TDEAccelShortcuts
#include "../../twin/twinbindings.cpp"
#include "../../kicker/kicker/core/kickerbindings.cpp"
#include "../../kicker/taskbar/taskbarbindings.cpp"
#include "../../kdesktop/kdesktopbindings.cpp"
#include "../../klipper/klipperbindings.cpp"
#include "../../kxkb/kxkbbindings.cpp"
#undef KShortcuts
#undef TDEShortcuts
KeyScheme = "Global Key Scheme";
KeySet = "Global Keys";
// Sorting Hack: I'll re-write the module once feature-adding begins again.
@ -92,12 +92,12 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
}
if ( KeyType == "standard" ) {
for(uint i=0; i<KStdAccel::NB_STD_ACCELS; i++) {
KStdAccel::StdAccel id = (KStdAccel::StdAccel)i;
actions.insertAction( KStdAccel::action(id),
KStdAccel::description(id),
KStdAccel::defaultKey3(id),
KStdAccel::defaultKey4(id) );
for(uint i=0; i<TDEStdAccel::NB_STD_ACCELS; i++) {
TDEStdAccel::StdAccel id = (TDEStdAccel::StdAccel)i;
actions.insertAction( TDEStdAccel::action(id),
TDEStdAccel::description(id),
TDEStdAccel::defaultKey3(id),
TDEStdAccel::defaultKey4(id) );
}
KeyScheme = "Standard Key Scheme";
@ -459,7 +459,7 @@ void KKeyModule::readScheme( int index )
}
}*/
/*void KKeyModule::updateKeys( const KAccelActions* map_P )
/*void KKeyModule::updateKeys( const TDEAccelActions* map_P )
{
kc->updateKeys( map_P );
}*/
@ -473,24 +473,24 @@ void KKeyModule::init()
/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
KAccel::useFourModifierKeys( fourMods == "true" );
bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", TDEAccel::keyboardHasMetaKey() ? "true" : "false" );
TDEAccel::useFourModifierKeys( fourMods == "true" );
bool bUseFourModifierKeys = TDEAccel::useFourModifierKeys();
TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
*/
KAccelActions* keys = new KAccelActions();
TDEAccelActions* keys = new TDEAccelActions();
kdDebug(125) << "KKeyModule::init() - Load Included Bindings\n";
// this should match the included files above
#define NOSLOTS
#define KShortcuts KAccelShortcuts
#define TDEShortcuts TDEAccelShortcuts
#include "../../klipper/klipperbindings.cpp"
#include "../../twin/twinbindings.cpp"
#include "../../kicker/kicker/core/kickerbindings.cpp"
#include "../../kicker/taskbar/taskbarbindings.cpp"
#include "../../kdesktop/kdesktopbindings.cpp"
#include "../../kxkb/kxkbbindings.cpp"
#undef KShortcuts
#undef TDEShortcuts
kdDebug(125) << "KKeyModule::init() - Read Config Bindings\n";
keys->readActions( "Global Keys" );
@ -508,19 +508,19 @@ void KKeyModule::init()
// KeyChooserSpec
//-----------------------------------------------------------------
KeyChooserSpec::KeyChooserSpec( KAccelActions& actions, TQWidget* parent, bool bGlobal )
KeyChooserSpec::KeyChooserSpec( TDEAccelActions& actions, TQWidget* parent, bool bGlobal )
: KKeyChooser( actions, parent, bGlobal, false, true ), m_bGlobal( bGlobal )
{
//if( global )
// globalDict()->clear(); // don't check against global keys twice
}
/*void KeyChooserSpec::updateKeys( const KAccelActions* map_P )
/*void KeyChooserSpec::updateKeys( const TDEAccelActions* map_P )
{
if( global )
{
stdDict()->clear();
for( KAccelActions::ConstIterator gIt( map_P->begin());
for( TDEAccelActions::ConstIterator gIt( map_P->begin());
gIt != map_P->end();
++gIt )
{
@ -532,7 +532,7 @@ KeyChooserSpec::KeyChooserSpec( KAccelActions& actions, TQWidget* parent, bool b
else
{
globalDict()->clear();
for( KAccelActions::ConstIterator gIt( map_P->begin());
for( TDEAccelActions::ConstIterator gIt( map_P->begin());
gIt != map_P->end();
++gIt )
{

12
kcontrol/keys/keyconfig.h
Unescape Escape View File

@ -24,8 +24,8 @@ class KKeyModule : public TQWidget
{
Q_OBJECT
public:
KAccelActions actions;
//KAccelActions dict;
TDEAccelActions actions;
//TDEAccelActions dict;
KeyChooserSpec *kc;
KKeyModule( TQWidget *parent, bool isGlobal, bool bSeriesOnly, bool bSeriesNone, const char *name = 0 );
@ -51,12 +51,12 @@ public slots:
//void slotRemove();
void slotKeyChange();
void slotPreferMeta();
//void updateKeys( const KAccelActions* map_P );
//void updateKeys( const TDEAccelActions* map_P );
//void readSchemeNames();
signals:
void keyChange();
//void keysChanged( const KAccelActions* map_P );
//void keysChanged( const TDEAccelActions* map_P );
protected:
TQListBox *sList;
@ -79,9 +79,9 @@ class KeyChooserSpec : public KKeyChooser
{
Q_OBJECT
public:
KeyChooserSpec( KAccelActions& actions, TQWidget* parent,
KeyChooserSpec( TDEAccelActions& actions, TQWidget* parent,
bool bGlobal );
//void updateKeys( const KAccelActions* map_P );
//void updateKeys( const TDEAccelActions* map_P );
protected:
bool m_bGlobal;
};

8
kcontrol/keys/main.cpp
Unescape Escape View File

@ -154,12 +154,12 @@ extern "C"
/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
KAccel::useFourModifierKeys( fourMods == "true" );
bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", TDEAccel::keyboardHasMetaKey() ? "true" : "false" );
TDEAccel::useFourModifierKeys( fourMods == "true" );
bool bUseFourModifierKeys = TDEAccel::useFourModifierKeys();
TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
*/
KAccelActions* keys = new KAccelActions();
TDEAccelActions* keys = new TDEAccelActions();
kdDebug(125) << "KeyModule::init() - Load Included Bindings\n";
// this should match the included files above

18
kcontrol/keys/modifiers.cpp
Unescape Escape View File

@ -229,20 +229,20 @@ void ModifiersModule::initGUI()
pGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("X Modifier Mapping"), this );
pLayoutTop->addWidget( pGroup, 4, 0 );
m_plstXMods = new KListView( pGroup );
m_plstXMods = new TDEListView( pGroup );
m_plstXMods->setSorting( -1 );
m_plstXMods->setSelectionMode( TQListView::NoSelection );
m_plstXMods->setAllColumnsShowFocus( true );
m_plstXMods->addColumn( i18n("X11-Mod") );
new KListViewItem( m_plstXMods, "mod5" );
new KListViewItem( m_plstXMods, "mod4" );
new KListViewItem( m_plstXMods, "mod3" );
new KListViewItem( m_plstXMods, "mod2" );
new KListViewItem( m_plstXMods, "mod1" );
new KListViewItem( m_plstXMods, "control" );
new KListViewItem( m_plstXMods, "lock" );
new KListViewItem( m_plstXMods, "shift" );
new TDEListViewItem( m_plstXMods, "mod5" );
new TDEListViewItem( m_plstXMods, "mod4" );
new TDEListViewItem( m_plstXMods, "mod3" );
new TDEListViewItem( m_plstXMods, "mod2" );
new TDEListViewItem( m_plstXMods, "mod1" );
new TDEListViewItem( m_plstXMods, "control" );
new TDEListViewItem( m_plstXMods, "lock" );
new TDEListViewItem( m_plstXMods, "shift" );
//------------------
pLayoutTop->setRowStretch( 5, 1 );

4
kcontrol/keys/modifiers.h
Unescape Escape View File

@ -6,7 +6,7 @@
class TQCheckBox;
class TQLabel;
class KComboBox;
class KListView;
class TDEListView;
class ModifiersModule : public TQWidget
{
@ -30,7 +30,7 @@ class ModifiersModule : public TQWidget
TQLabel* m_plblCtrl, * m_plblAlt, * m_plblWin;
TQLabel* m_plblWinModX;
TQCheckBox* m_pchkMacKeyboard;
KListView* m_plstXMods;
TDEListView* m_plstXMods;
TQCheckBox* m_pchkMacSwap;
void initGUI();

16
kcontrol/keys/shortcuts.cpp
Unescape Escape View File

@ -107,8 +107,8 @@ void ShortcutsModule::initGUI()
TQString kde_winkeys_env_dir = TDEGlobal::dirs()->localtdedir() + "/env/";
kdDebug(125) << "A-----------" << endl;
KAccelActions* keys = &m_actionsGeneral;
// see also KShortcutsModule::init() below !!!
TDEAccelActions* keys = &m_actionsGeneral;
// see also TDEShortcutsModule::init() below !!!
#define NOSLOTS
#define KICKER_ALL_BINDINGS
#include "../../twin/twinbindings.cpp"
@ -187,7 +187,7 @@ void ShortcutsModule::initGUI()
// Yes, it does, so Win is a key
m_bUseRmWinKeys = false;
}
m_pListGeneral = new KAccelShortcutList( m_actionsGeneral, true );
m_pListGeneral = new TDEAccelShortcutList( m_actionsGeneral, true );
m_pkcGeneral = new KKeyChooser( m_pListGeneral, this, KKeyChooser::Global, false );
m_pkcGeneral->resize (m_pkcGeneral->sizeHint() );
@ -201,12 +201,12 @@ void ShortcutsModule::initGUI()
m_pTab->addTab( m_pkcGeneral, i18n("&Global Shortcuts") );
connect( m_pkcGeneral, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
m_pListSequence = new KAccelShortcutList( m_actionsSequence, true );
m_pListSequence = new TDEAccelShortcutList( m_actionsSequence, true );
m_pkcSequence = new KKeyChooser( m_pListSequence, this, KKeyChooser::Global, false );
m_pTab->addTab( m_pkcSequence, i18n("Shortcut Se&quences") );
connect( m_pkcSequence, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
m_pListApplication = new KStdAccel::ShortcutList;
m_pListApplication = new TDEStdAccel::ShortcutList;
m_pkcApplication = new KKeyChooser( m_pListApplication, this, KKeyChooser::Standard, false );
m_pTab->addTab( m_pkcApplication, i18n("App&lication Shortcuts") );
connect( m_pkcApplication, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
@ -222,7 +222,7 @@ void ShortcutsModule::initGUI()
void ShortcutsModule::createActionsGeneral()
{
KAccelActions& actions = m_actionsGeneral;
TDEAccelActions& actions = m_actionsGeneral;
for( uint i = 0; i < actions.count(); i++ ) {
TQString sConfigKey = actions[i].name();
@ -243,7 +243,7 @@ void ShortcutsModule::createActionsGeneral()
void ShortcutsModule::createActionsSequence()
{
KAccelActions& actions = m_actionsSequence;
TDEAccelActions& actions = m_actionsSequence;
for( uint i = 0; i < actions.count(); i++ ) {
TQString sConfigKey = actions[i].name();
@ -410,7 +410,7 @@ void ShortcutsModule::slotSaveSchemeAs()
TQDir dir( kksPath );
if( !dir.exists() && !dir.mkdir( kksPath ) ) {
tqWarning("KShortcutsModule: Could not make directory to store user info.");
tqWarning("TDEShortcutsModule: Could not make directory to store user info.");
return;
}

4
kcontrol/keys/shortcuts.h
Unescape Escape View File

@ -71,8 +71,8 @@ class ShortcutsModule : public TQWidget
TQPushButton* m_pbtnSave, * m_pbtnRemove;
int m_nSysSchemes;
TQStringList m_rgsSchemeFiles;
KAccelActions m_actionsGeneral, m_actionsSequence;//, m_actionsApplication;
KShortcutList* m_pListGeneral, * m_pListSequence, * m_pListApplication;
TDEAccelActions m_actionsGeneral, m_actionsSequence;//, m_actionsApplication;
TDEShortcutList* m_pListGeneral, * m_pListSequence, * m_pListApplication;
KKeyChooser* m_pkcGeneral, * m_pkcSequence, * m_pkcApplication;
TQCheckBox* m_useRmWinKeys;
bool m_bUseRmWinKeys;

10
kcontrol/keys/treeview.cpp
Unescape Escape View File

@ -35,16 +35,16 @@
#include "khotkeys.h"
AppTreeItem::AppTreeItem(TQListViewItem *parent, const TQString& storageId)
: KListViewItem(parent), m_init(false), m_storageId(storageId) {}
: TDEListViewItem(parent), m_init(false), m_storageId(storageId) {}
AppTreeItem::AppTreeItem(TQListViewItem *parent, TQListViewItem *after, const TQString& storageId)
: KListViewItem(parent, after), m_init(false), m_storageId(storageId) {}
: TDEListViewItem(parent, after), m_init(false), m_storageId(storageId) {}
AppTreeItem::AppTreeItem(TQListView *parent, const TQString& storageId)
: KListViewItem(parent), m_init(false), m_storageId(storageId) {}
: TDEListViewItem(parent), m_init(false), m_storageId(storageId) {}
AppTreeItem::AppTreeItem(TQListView *parent, TQListViewItem *after, const TQString& storageId)
: KListViewItem(parent, after), m_init(false), m_storageId(storageId) {}
: TDEListViewItem(parent, after), m_init(false), m_storageId(storageId) {}
void AppTreeItem::setName(const TQString &name)
{
@ -94,7 +94,7 @@ static TQPixmap appIcon(const TQString &iconName)
AppTreeView::AppTreeView( TQWidget *parent, const char *name )
: KListView(parent, name)
: TDEListView(parent, name)
{
setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
setAllColumnsShowFocus(true);

6
kcontrol/keys/treeview.h
Unescape Escape View File

@ -25,10 +25,10 @@
#include <klistview.h>
class TQPopupMenu;
class KActionCollection;
class TDEActionCollection;
class KDesktopFile;
class AppTreeItem : public KListViewItem
class AppTreeItem : public TDEListViewItem
{
public:
@ -58,7 +58,7 @@ private:
TQString m_accel;
};
class AppTreeView : public KListView
class AppTreeView : public TDEListView
{
friend class AppTreeItem;
Q_OBJECT

14
kcontrol/kfontinst/ChangeLog
Unescape Escape View File

@ -248,7 +248,7 @@ KDE3.1 -> KDE3.2
6. Advanced editing of XftConfig.
7. Added help on XftConfig - from Danny Tholen (obiwan@mailmij.org)
8. Removed some memory leaks
10. Default folders changed for non-root users. KFontinst will now (upon initial start-up) select the following:
10. Default folders changed for non-root users. TDEFontinst will now (upon initial start-up) select the following:
X fonts dir: $TDEHOME/share/fonts
XConfig file: $TDEHOME/share/fonts/fontpaths
@ -261,7 +261,7 @@ KDE3.1 -> KDE3.2
...Also to accomplish this, some changes are needed to 'starttde' - see file README.starttde
11. Because of the above, when started as non-root, KFontinst will create Type1 and TrueType sub-folders in
11. Because of the above, when started as non-root, TDEFontinst will create Type1 and TrueType sub-folders in
$TDEHOME/share/fonts - if they do not already exist.
12. Moved XftConfig stuff from a sub-page of settings tab into its own tab.
13. Added question dialog if module is unloaded before system has been configured.
@ -301,23 +301,23 @@ KDE3.1 -> KDE3.2
11. Support more encodings - encodings combos now list standard encodings as well as those read from
.enc(.gz) files.
12. Internal AMF creator for Type1 and TrueType fonts - ttf2pt1 and pf2afm.ps are no longer used/supplied.
13. Removed the 'Process AFMs' & 'Delete AFMs' options - all AFMs are created be KFontinst, therefore they
13. Removed the 'Process AFMs' & 'Delete AFMs' options - all AFMs are created be TDEFontinst, therefore they
should be OK for StarOffice and AbiWord.
14. If a writable XF86Config file is found - then complete folders may be installed, and folders in the X11
directory may be uninstalled or disabled (i.e. the folder is not deleted, but it's entry is removed from
the XF86Config file).
15. No longer supply .enc files with KFontinst - they should be provided by the distro.
15. No longer supply .enc files with TDEFontinst - they should be provided by the distro.
0.9.1->0.9.2
============
1. Removed a bug where the "Configure System" menu entry was always disabled!
2. Spelling error in Settings dialog.
3. t1lib has problems with some of the fonts supplied with Adobe acrobat - therefore, if t1lib fails to load the
font, then KFontinst itself will try to read the header information (although no preview will be available,
font, then TDEFontinst itself will try to read the header information (although no preview will be available,
everything else should still work).
4. Fixed multiple installing of programs in other/ directory. For instance KFontinst's version of ttmkfdir
4. Fixed multiple installing of programs in other/ directory. For instance TDEFontinst's version of ttmkfdir
was being installed into $(PREFIX) (usually /usr/bin) as well as $(KDE_DATADIR)/kfontinst - this was incorrect
as KFontinst will only use the version in $(KDE_DATADIR)/kfontinst, and it was possible that a previous version
as TDEFontinst will only use the version in $(KDE_DATADIR)/kfontinst, and it was possible that a previous version
of ttmkfdir (such as that supplied with XFree86) would have been overwritten.
5. Fixed bug where the user was allowed to select (and subsequently install) fonts which could not be loaded correctly.
6. Added the ability to enter a custom preview string.

2
kcontrol/kfontinst/configure.in.bot
Unescape Escape View File

@ -2,7 +2,7 @@ dnl put here things which have to be done as very last part of configure
if test -z "$FONTINST_SUBDIR"; then
echo ""
echo "KFontInstall control module got disabled from compilation"
echo "TDEFontInstall control module got disabled from compilation"
echo "because of missing FreeType 2.x libraries/headers."
echo "You can download the freetype library from http://www.freetype.org/."
echo ""

24
kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
Unescape Escape View File

@ -137,7 +137,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
TQGridLayout *fontsLayout=new TQGridLayout(fontsFrame, 1, 1, 0, 1);
TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint());
KToolBar *toolbar=new KToolBar(this);
TDEToolBar *toolbar=new TDEToolBar(this);
bool showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false));
fontsFrame->setLineWidth(0);
@ -177,10 +177,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
//
// Now for the hack!
KAction *act;
KActionMenu *topMnu=dynamic_cast<KActionMenu *>(itsDirOp->actionCollection()->action("popupMenu"));
TDEAction *act;
TDEActionMenu *topMnu=dynamic_cast<TDEActionMenu *>(itsDirOp->actionCollection()->action("popupMenu"));
itsViewMenuAct=dynamic_cast<KActionMenu *>(itsDirOp->actionCollection()->action("view menu"));
itsViewMenuAct=dynamic_cast<TDEActionMenu *>(itsDirOp->actionCollection()->action("view menu"));
topMnu->popupMenu()->clear();
connect(topMnu->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupMenu()));
if((act=itsDirOp->actionCollection()->action("up")))
@ -197,28 +197,28 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
topMnu->insert(itsViewMenuAct);
if((itsIconAct=dynamic_cast<KRadioAction *>(itsDirOp->actionCollection()->action("short view"))))
if((itsIconAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("short view"))))
{
disconnect(itsIconAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotSimpleView()));
connect(itsIconAct, TQT_SIGNAL(activated()), TQT_SLOT(iconView()));
itsIconAct->plug(toolbar);
}
if((itsListAct=dynamic_cast<KRadioAction *>(itsDirOp->actionCollection()->action("detailed view"))))
if((itsListAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("detailed view"))))
{
disconnect(itsListAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotDetailedView()));
connect(itsListAct, TQT_SIGNAL(activated()), TQT_SLOT(listView()));
itsListAct->plug(toolbar);
}
itsShowBitmapAct=new KToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()),
itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()),
itsDirOp->actionCollection(), "showbitmap");
itsShowBitmapAct->setChecked(showBitmap);
itsShowBitmapAct->plug(toolbar);
toolbar->insertLineSeparator();
act=new KAction(i18n("Add Fonts..."), "newfont", 0, TQT_TQOBJECT(this), TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts");
act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, TQT_TQOBJECT(this), TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts");
act->plug(toolbar);
topMnu->insert(act);
@ -232,11 +232,11 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
}
toolbar->insertLineSeparator();
act=new KAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure");
act=new TDEAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure");
act->plug(toolbar);
#ifdef HAVE_XFT
toolbar->insertLineSeparator();
act=new KAction(i18n("Print..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print");
act=new TDEAction(i18n("Print..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print");
act->plug(toolbar);
#endif
@ -251,7 +251,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
#ifdef HAVE_XFT
if(itsPreview)
{
KActionCollection *previewCol=itsPreview->actionCollection();
TDEActionCollection *previewCol=itsPreview->actionCollection();
if(previewCol && previewCol->count()>0 && (act=previewCol->action("changeText")))
act->plug(toolbar);
@ -616,7 +616,7 @@ void CKCmFontInst::jobResult(TDEIO::Job *job)
i18n("Please note that any open applications will need to be restarted in order "
"for any changes to be noticed."),
#endif
i18n("Success"), "KFontinst_WarnAboutFontChangesAndOpenApps");
i18n("Success"), "TDEFontinst_WarnAboutFontChangesAndOpenApps");
}
void CKCmFontInst::addFonts(const KURL::List &src, const KURL &dest)

16
kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
Unescape Escape View File

@ -43,10 +43,10 @@
#endif
class KDirOperator;
class KAction;
class KRadioAction;
class KActionMenu;
class KToggleAction;
class TDEAction;
class TDERadioAction;
class TDEActionMenu;
class TDEToggleAction;
class KFileItem;
class TQLabel;
class TQSplitter;
@ -95,13 +95,13 @@ class CKCmFontInst : public TDECModule
KDirOperator *itsDirOp;
KURL itsTop;
KToggleAction *itsShowBitmapAct;
KAction *itsSepDirsAct,
TDEToggleAction *itsShowBitmapAct;
TDEAction *itsSepDirsAct,
*itsShowHiddenAct,
*itsDeleteAct;
KRadioAction *itsListAct,
TDERadioAction *itsListAct,
*itsIconAct;
KActionMenu *itsViewMenuAct;
TDEActionMenu *itsViewMenuAct;
#ifdef HAVE_XFT
KParts::ReadOnlyPart *itsPreview;
#endif

24
kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
Unescape Escape View File

@ -64,7 +64,7 @@ class CKFileFontView::CKFileFontViewPrivate
};
CKFileFontView::CKFileFontView(TQWidget *parent, const char *name)
: KListView(parent, name),
: TDEListView(parent, name),
KFileView(),
d(new CKFileFontViewPrivate())
{
@ -106,7 +106,7 @@ void CKFileFontView::setSelected(const KFileItem *info, bool enable)
CFontListViewItem *item = (CFontListViewItem*)info->extraData(this);
if (item)
KListView::setSelected(item, enable);
TDEListView::setSelected(item, enable);
}
}
@ -117,7 +117,7 @@ void CKFileFontView::setCurrentItem(const KFileItem *item)
CFontListViewItem *it = (CFontListViewItem*) item->extraData(this);
if (it)
KListView::setCurrentItem(it);
TDEListView::setCurrentItem(it);
}
}
@ -130,18 +130,18 @@ KFileItem * CKFileFontView::currentFileItem() const
void CKFileFontView::clearSelection()
{
KListView::clearSelection();
TDEListView::clearSelection();
}
void CKFileFontView::selectAll()
{
if (KFile::NoSelection!=KFileView::selectionMode() && KFile::Single!=KFileView::selectionMode())
KListView::selectAll(true);
TDEListView::selectAll(true);
}
void CKFileFontView::invertSelection()
{
KListView::invertSelection();
TDEListView::invertSelection();
}
void CKFileFontView::slotActivateMenu(TQListViewItem *item,const TQPoint& pos)
@ -158,7 +158,7 @@ void CKFileFontView::slotActivateMenu(TQListViewItem *item,const TQPoint& pos)
void CKFileFontView::clearView()
{
itsResolver->m_lstPendingMimeIconItems.clear();
KListView::clear();
TDEListView::clear();
}
void CKFileFontView::insertItem(KFileItem *i)
@ -357,8 +357,8 @@ void CKFileFontView::slotSortingChanged(int col)
i->setKey(sortingKey(i->text(itsSortingCol), item->isDir(), sortSpec));
}
KListView::setSorting(itsSortingCol, !reversed);
KListView::sort();
TDEListView::setSorting(itsSortingCol, !reversed);
TDEListView::sort();
if (!itsBlockSortingSignal)
sig->changeSorting( static_cast<TQDir::SortSpec>( sortSpec ) );
@ -392,7 +392,7 @@ void CKFileFontView::ensureItemVisible(const KFileItem *i)
CFontListViewItem *item = (CFontListViewItem*) i->extraData(this);
if ( item )
KListView::ensureItemVisible(item);
TDEListView::ensureItemVisible(item);
}
}
@ -435,7 +435,7 @@ KFileItem * CKFileFontView::prevItem(const KFileItem *fileItem) const
void CKFileFontView::keyPressEvent(TQKeyEvent *e)
{
KListView::keyPressEvent(e);
TDEListView::keyPressEvent(e);
if (Key_Return==e->key() || Key_Enter==e->key())
if (e->state() & ControlButton)
@ -638,7 +638,7 @@ void CFontListViewItem::init()
void CKFileFontView::virtual_hook(int id, void *data)
{
KListView::virtual_hook(id, data);
TDEListView::virtual_hook(id, data);
KFileView::virtual_hook(id, data);
}

16
kcontrol/kfontinst/kcmfontinst/KFileFontView.h
Unescape Escape View File

@ -48,12 +48,12 @@ class TQKeyEvent;
* An item for the listiew, that has a reference to its corresponding
* @ref KFileItem.
*/
class CFontListViewItem : public KListViewItem
class CFontListViewItem : public TDEListViewItem
{
public:
CFontListViewItem(TQListView *parent, const TQString &text, const TQPixmap &icon, KFileItem *fi)
: KListViewItem(parent, text),
: TDEListViewItem(parent, text),
itsInf(fi)
{
setPixmap(0, icon);
@ -61,14 +61,14 @@ class CFontListViewItem : public KListViewItem
}
CFontListViewItem(TQListView *parent, KFileItem *fi)
: KListViewItem(parent),
: TDEListViewItem(parent),
itsInf(fi)
{
init();
}
CFontListViewItem(TQListView *parent, const TQString &text, const TQPixmap &icon, KFileItem *fi, TQListViewItem *after)
: KListViewItem(parent, after),
: TDEListViewItem(parent, after),
itsInf(fi)
{
setPixmap(0, icon);
@ -113,7 +113,7 @@ class CFontListViewItem : public KListViewItem
* @see KCombiView
* @see KFileIconView
*/
class CKFileFontView : public KListView, public KFileView
class CKFileFontView : public TDEListView, public KFileView
{
Q_OBJECT
@ -192,9 +192,9 @@ class CKFileFontView : public KListView, public KFileView
private:
virtual void insertItem(TQListViewItem *i) { KListView::insertItem(i); }
virtual void setSorting(int i, bool b) { KListView::setSorting(i, b); }
virtual void setSelected(TQListViewItem *i, bool b) { KListView::setSelected(i, b); }
virtual void insertItem(TQListViewItem *i) { TDEListView::insertItem(i); }
virtual void setSorting(int i, bool b) { TDEListView::setSorting(i, b); }
virtual void setSelected(TQListViewItem *i, bool b) { TDEListView::setSelected(i, b); }
inline CFontListViewItem * viewItem( const KFileItem *item ) const
{

2
kcontrol/kfontinst/viewpart/FontViewPart.cpp
Unescape Escape View File

@ -107,7 +107,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install()));
connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int)));
itsChangeTextAction=new KAction(i18n("Change Text..."), "text", KShortcut(),
itsChangeTextAction=new TDEAction(i18n("Change Text..."), "text", TDEShortcut(),
this, TQT_SLOT(changeText()), actionCollection(), "changeText");
itsChangeTextAction->setEnabled(false);
itsPrintAction=KStdAction::print(this, TQT_SLOT(print()), actionCollection(), "print");

4
kcontrol/kfontinst/viewpart/FontViewPart.h
Unescape Escape View File

@ -35,7 +35,7 @@ class TQPushButton;
class TQFrame;
class TQLabel;
class KIntNumInput;
class KAction;
class TDEAction;
class KURL;
namespace KFI
@ -74,7 +74,7 @@ class CFontViewPart : public KParts::ReadOnlyPart
*itsToolsFrame;
TQLabel *itsFaceLabel;
KIntNumInput *itsFaceSelector;
KAction *itsChangeTextAction,
TDEAction *itsChangeTextAction,
*itsPrintAction;
bool itsShowInstallButton;
int itsFace;

6
kcontrol/kfontinst/viewpart/kfontview.desktop
Unescape Escape View File

@ -1,10 +1,10 @@
[Desktop Entry]
Name=KFontView
Name=TDEFontView
Name[be]=Прагляд шрыфтоў
Name[bn]=কে-ফন্ট-ভিউ
Name[cs]=Prohlížeč písem
Name[eo]=Tiparorigardilo
Name[eu]=KFontWiew
Name[eu]=TDEFontWiew
Name[he]=מציג גופנים
Name[hi]=के-फ़ॉन्ट-व्यू
Name[mk]=КФонтПреглед
@ -18,7 +18,7 @@ Name[sk]=Prehliadač písiem
Name[sv]=Kfontview
Name[tg]=Намоишгари КҲарф
Name[vi]=Trình xem phông chữ TDE
Name[wa]=Håyneu di fontes (KFontView)
Name[wa]=Håyneu di fontes (TDEFontView)
Name[zh_CN]=字体预览
Exec=kfontview %i %u
Icon=fonts

2
kcontrol/kicker/applettab_impl.h
Unescape Escape View File

@ -28,7 +28,7 @@ class TQGroupBox;
class TQButtonGroup;
class TQRadioButton;
class TQPushButton;
class KListView;
class TDEListView;
class TQListViewItem;
class AppletTab : public AppletTabBase

4
kcontrol/kicker/menutab.ui
Unescape Escape View File

@ -193,7 +193,7 @@
</spacer>
</vbox>
</widget>
<widget class="KListView">
<widget class="TDEListView">
<column>
<property name="text">
<string>Optional Menus</string>
@ -366,7 +366,7 @@
<string>Font:</string>
</property>
</widget>
<widget class="KFontRequester" row="2" column="1" rowspan="1" colspan="3">
<widget class="TDEFontRequester" row="2" column="1" rowspan="1" colspan="3">
<property name="name">
<cstring>kcfg_ButtonFont</cstring>
</property>

4
kcontrol/konq/desktopbehavior.ui
Unescape Escape View File

@ -330,7 +330,7 @@
&lt;p&gt;For example, files which are named ".directory" are plain text files which contain information for Konqueror, such as the icon to use in displaying a directory, the order in which files should be sorted, etc. You should not change or delete these files unless you know what you are doing.&lt;/p&gt;</string>
</property>
</widget>
<widget class="KListView" row="2" column="0">
<widget class="TDEListView" row="2" column="0">
<column>
<property name="text">
<string>Show Icon Previews For</string>
@ -373,7 +373,7 @@
<string>&amp;Show device icons:</string>
</property>
</widget>
<widget class="KListView">
<widget class="TDEListView">
<column>
<property name="text">
<string>Device Types to Display</string>

2
kcontrol/konq/fontopts.cpp
Unescape Escape View File

@ -56,7 +56,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
row++;
m_pStandard = new KFontCombo( this );
m_pStandard = new TDEFontCombo( this );
label = new TQLabel( m_pStandard, i18n("&Standard font:"), this );
lay->addWidget(label,row,0);
lay->addMultiCellWidget(m_pStandard,row,row,1,1);

4
kcontrol/konq/fontopts.h
Unescape Escape View File

@ -44,7 +44,7 @@ class TQRadioButton;
class KColorButton;
class TDEConfig;
class KFontCombo;
class TDEFontCombo;
//-----------------------------------------------------------------------------
@ -88,7 +88,7 @@ private:
TQRadioButton* m_pMedium;
TQRadioButton* m_pLarge;
*/
KFontCombo* m_pStandard;
TDEFontCombo* m_pStandard;
TQSpinBox* m_pSize;
int m_fSize;

2
kcontrol/konq/previews.cpp
Unescape Escape View File

@ -77,7 +77,7 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ )
"no preview will be generated for files bigger than 10 MB, for speed reasons."));
// Listview containing checkboxes for all protocols that support listing
KListView *listView = new KListView( this, "listView" );
TDEListView *listView = new TDEListView( this, "listView" );
listView->addColumn( i18n( "Select Protocols" ) );
listView->setFullWidth( true );

2
kcontrol/konq/rootopts.h
Unescape Escape View File

@ -24,7 +24,7 @@ class TQComboBox;
class TQPushButton;
class TDEConfig;
class KListView;
class TDEListView;
class KURLRequester;
namespace TDEIO { class Job; }

12
kcontrol/konqhtml/appearance.cpp
Unescape Escape View File

@ -67,7 +67,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
TQLabel* label = new TQLabel( i18n("S&tandard font:"), this );
lay->addWidget( label , ++r, E);
m_pFonts[0] = new KFontCombo( emptyList, this );
m_pFonts[0] = new TDEFontCombo( emptyList, this );
label->setBuddy( m_pFonts[0] );
lay->addMultiCellWidget(m_pFonts[0], r, r, M, W);
@ -88,7 +88,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
label = new TQLabel( i18n( "&Fixed font:"), this );
lay->addWidget( label, ++r, E );
m_pFonts[1] = new KFontCombo( emptyList, this );
m_pFonts[1] = new TDEFontCombo( emptyList, this );
label->setBuddy( m_pFonts[1] );
lay->addMultiCellWidget(m_pFonts[1], r, r, M, W);
@ -109,7 +109,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
label = new TQLabel( i18n( "S&erif font:" ), this );
lay->addWidget( label, ++r, E );
m_pFonts[2] = new KFontCombo( emptyList, this );
m_pFonts[2] = new TDEFontCombo( emptyList, this );
label->setBuddy( m_pFonts[2] );
lay->addMultiCellWidget( m_pFonts[2], r, r, M, W );
@ -130,7 +130,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
label = new TQLabel( i18n( "Sa&ns serif font:" ), this );
lay->addWidget( label, ++r, E );
m_pFonts[3] = new KFontCombo( emptyList, this );
m_pFonts[3] = new TDEFontCombo( emptyList, this );
label->setBuddy( m_pFonts[3] );
lay->addMultiCellWidget( m_pFonts[3], r, r, M, W );
@ -152,7 +152,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
label = new TQLabel( i18n( "C&ursive font:" ), this );
lay->addWidget( label, ++r, E );
m_pFonts[4] = new KFontCombo( emptyList, this );
m_pFonts[4] = new TDEFontCombo( emptyList, this );
label->setBuddy( m_pFonts[4] );
lay->addMultiCellWidget( m_pFonts[4], r, r, M, W );
@ -174,7 +174,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
label = new TQLabel( i18n( "Fantas&y font:" ), this );
lay->addWidget( label, ++r, E );
m_pFonts[5] = new KFontCombo( emptyList, this );
m_pFonts[5] = new TDEFontCombo( emptyList, this );
label->setBuddy( m_pFonts[5] );
lay->addMultiCellWidget( m_pFonts[5], r, r, M, W );

4
kcontrol/konqhtml/appearance.h
Unescape Escape View File

@ -17,7 +17,7 @@
#include <tdecmodule.h>
class TQSpinBox;
class KFontCombo;
class TDEFontCombo;
class KAppearanceOptions : public TDECModule
{
@ -55,7 +55,7 @@ private:
KIntNumInput* m_minSize;
KIntNumInput* m_MedSize;
KIntNumInput* m_pageDPI;
KFontCombo* m_pFonts[6];
TDEFontCombo* m_pFonts[6];
TQComboBox* m_pEncoding;
TQSpinBox *m_pFontSizeAdjust;

2
kcontrol/konqhtml/domainlistview.cpp
Unescape Escape View File

@ -43,7 +43,7 @@ DomainListView::DomainListView(TDEConfig *config,const TQString &title,
thisLayout->setSpacing(KDialog::spacingHint());
thisLayout->setMargin(KDialog::marginHint());
domainSpecificLV = new KListView(this);
domainSpecificLV = new TDEListView(this);
domainSpecificLV->addColumn(i18n("Host/Domain"));
domainSpecificLV->addColumn(i18n("Policy"), 100);
connect(domainSpecificLV,TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(changePressed()));

6
kcontrol/konqhtml/domainlistview.h
Unescape Escape View File

@ -30,7 +30,7 @@ class TQPushButton;
class TQStringList;
class TDEConfig;
class KListView;
class TDEListView;
class Policies;
class PolicyDialog;
@ -80,7 +80,7 @@ public:
/**
* returns the list view displaying the domains
*/
KListView *listView() const { return domainSpecificLV; }
TDEListView *listView() const { return domainSpecificLV; }
/**
* returns the add push-button.
@ -193,7 +193,7 @@ protected:
TDEConfig *config;
KListView *domainSpecificLV;
TDEListView *domainSpecificLV;
TQPushButton* addDomainPB;
TQPushButton* changeDomainPB;

2
kcontrol/konqhtml/javaopts.h
Unescape Escape View File

@ -22,7 +22,7 @@
class KColorButton;
class TDEConfig;
class KListView;
class TDEListView;
class KURLRequester;
class KIntNumInput;

2
kcontrol/konqhtml/nsconfigwidget.ui
Unescape Escape View File

@ -161,7 +161,7 @@
<string>&amp;Up</string>
</property>
</widget>
<widget class="KListBox" row="1" column="0" rowspan="4" colspan="2">
<widget class="TDEListBox" row="1" column="0" rowspan="4" colspan="2">
<property name="name">
<cstring>dirList</cstring>
</property>

2
kcontrol/privacy/kcmprivacydialog.ui
Unescape Escape View File

@ -50,7 +50,7 @@
<property name="orientation">
<enum>Vertical</enum>
</property>
<widget class="KListView">
<widget class="TDEListView">
<property name="name">
<cstring>privacyListView</cstring>
</property>

4
kcontrol/privacy/kprivacymanager.cpp
Unescape Escape View File

@ -117,8 +117,8 @@ bool KPrivacyManager::clearWebCache() const
bool KPrivacyManager::clearRecentDocuments() const
{
KRecentDocument::clear();
return KRecentDocument::recentDocuments().isEmpty();
TDERecentDocument::clear();
return TDERecentDocument::recentDocuments().isEmpty();
}
bool KPrivacyManager::clearQuickStartMenu() const

6
kcontrol/privacy/privacy.cpp
Unescape Escape View File

@ -71,7 +71,7 @@ Privacy::Privacy(TQWidget *parent, const char *name)
//privacyTabs->addTab(p3pSettings, i18n("Privacy Settings"));
KListView *sw = cleaningDialog->privacyListView;
TDEListView *sw = cleaningDialog->privacyListView;
sw->addColumn(i18n("Privacy Settings"));
sw->addColumn(i18n("Description"));
@ -82,8 +82,8 @@ Privacy::Privacy(TQWidget *parent, const char *name)
generalCLI = new KListViewItem(sw, i18n("General") );
webbrowsingCLI = new KListViewItem(sw, i18n("Web Browsing") );
generalCLI = new TDEListViewItem(sw, i18n("General") );
webbrowsingCLI = new TDEListViewItem(sw, i18n("Web Browsing") );
generalCLI->setOpen(true);
webbrowsingCLI->setOpen(true);

4
kcontrol/privacy/privacy.h
Unescape Escape View File

@ -53,8 +53,8 @@ private:
TQPtrList<TQCheckListItem> checklist;
KListViewItem *generalCLI;
KListViewItem *webbrowsingCLI;
TDEListViewItem *generalCLI;
TDEListViewItem *webbrowsingCLI;
TQCheckListItem *clearThumbnails;
TQCheckListItem *clearRunCommandHistory;

6
kcontrol/randr/configdialog.h
Unescape Escape View File

@ -35,7 +35,7 @@
class TDEGlobalAccel;
class KKeyChooser;
class KListView;
class TDEListView;
class TQPushButton;
class TQDialog;
class ConfigDialog;
@ -56,11 +56,11 @@ private:
};
class ListView : public KListView
class ListView : public TDEListView
{
public:
ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name )
: KListView( parent, name ), _configWidget( configWidget ),
: TDEListView( parent, name ), _configWidget( configWidget ),
_regExpEditor(0L) {}
// TQListView has a weird idea of a sizeHint...
virtual TQSize sizeHint () const {

2
kcontrol/randr/tderandrbindings.cpp
Unescape Escape View File

@ -28,7 +28,7 @@
keys->insert( "Program:tderandrtray", i18n("Display Control") );
DEF( I18N_NOOP("Switch Displays"), KShortcut(TQString("XF86Display")), KShortcut(TQString("XF86Display")), slotCycleDisplays() );
DEF( I18N_NOOP("Switch Displays"), TDEShortcut(TQString("XF86Display")), TDEShortcut(TQString("XF86Display")), slotCycleDisplays() );
#undef DEF
#undef WIN

24
kcontrol/randr/tderandrtray.cpp
Unescape Escape View File

@ -223,7 +223,7 @@ void KRandRSystemTray::reloadDisplayConfiguration()
}
}
void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu)
{
int lastIndex = 0;
@ -247,7 +247,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
/*lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1));
menu->setItemEnabled(lastIndex, false);*/
} else {
KPopupMenu* subMenu = new KPopupMenu(menu, TQString("screen%1").arg(s+1).latin1());
TDEPopupMenu* subMenu = new TDEPopupMenu(menu, TQString("screen%1").arg(s+1).latin1());
m_screenPopups.append(subMenu);
populateMenu(subMenu);
lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu);
@ -293,23 +293,23 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
menu->insertTitle(SmallIcon("randr"), i18n("Global Configuation"));
KAction *actColors = new KAction( i18n( "Configure Displays..." ),
SmallIconSet( "configure" ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDisplayConfig() ),
TDEAction *actColors = new TDEAction( i18n( "Configure Displays..." ),
SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDisplayConfig() ),
actionCollection() );
actColors->plug( menu );
// KAction *actPrefs = new KAction( i18n( "Configure Display..." ),
// SmallIconSet( "configure" ), KShortcut(), this, TQT_SLOT( slotPrefs() ),
// TDEAction *actPrefs = new TDEAction( i18n( "Configure Display..." ),
// SmallIconSet( "configure" ), TDEShortcut(), this, TQT_SLOT( slotPrefs() ),
// actionCollection() );
// actPrefs->plug( menu );
KAction *actSKeys = new KAction( i18n( "Configure Shortcut Keys..." ),
SmallIconSet( "configure" ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ),
TDEAction *actSKeys = new TDEAction( i18n( "Configure Shortcut Keys..." ),
SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ),
actionCollection() );
actSKeys->plug( menu );
menu->insertItem(SmallIcon("help"),KStdGuiItem::help().text(), m_help->menu());
KAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit));
TDEAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit));
quitAction->plug(menu);
m_menu = menu;
@ -317,7 +317,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
void KRandRSystemTray::slotScreenActivated()
{
setCurrentScreen(m_screenPopups.find(static_cast<const KPopupMenu*>(sender())));
setCurrentScreen(m_screenPopups.find(static_cast<const TDEPopupMenu*>(sender())));
}
void KRandRSystemTray::configChanged()
@ -391,7 +391,7 @@ int KRandRSystemTray::GetHackResolutionParameter() {
return resparm;
}
void KRandRSystemTray::populateMenu(KPopupMenu* menu)
void KRandRSystemTray::populateMenu(TDEPopupMenu* menu)
{
int lastIndex = 0;
@ -718,7 +718,7 @@ void KRandRSystemTray::findPrimaryDisplay()
}
}
void KRandRSystemTray::addOutputMenu(KPopupMenu* menu)
void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
{
XRROutputInfo *output_info;
char *output_name;

12
kcontrol/randr/tderandrtray.h
Unescape Escape View File

@ -28,7 +28,7 @@
#include <tdehardwaredevices.h>
class KHelpMenu;
class KPopupMenu;
class TDEPopupMenu;
class KRandRSystemTray : public KSystemTray, public KRandrSimpleAPI
{
@ -38,7 +38,7 @@ public:
KRandRSystemTray(TQWidget* parent = 0, const char *name = 0);
TDEGlobalAccel *globalKeys;
virtual void contextMenuAboutToShow(KPopupMenu* menu);
virtual void contextMenuAboutToShow(TDEPopupMenu* menu);
void configChanged();
@ -64,8 +64,8 @@ protected:
void resizeEvent ( TQResizeEvent * );
private:
void populateMenu(KPopupMenu* menu);
void addOutputMenu(KPopupMenu* menu);
void populateMenu(TDEPopupMenu* menu);
void addOutputMenu(TDEPopupMenu* menu);
int GetDefaultResolutionParameter();
int GetHackResolutionParameter();
void findPrimaryDisplay();
@ -73,7 +73,7 @@ private:
bool m_popupUp;
KHelpMenu* m_help;
TQPtrList<KPopupMenu> m_screenPopups;
TQPtrList<TDEPopupMenu> m_screenPopups;
Display *randr_display;
ScreenInfo *randr_screen_info;
@ -82,7 +82,7 @@ private:
int last_known_x;
int last_known_y;
KPopupMenu* m_menu;
TDEPopupMenu* m_menu;
KSimpleConfig *r_config;
KSimpleConfig *t_config;

28
kcontrol/smartcard/smartcard.cpp
Unescape Escape View File

@ -69,7 +69,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
base = new SmartcardBase(this);
layout->add(base);
_popUpKardChooser = new KPopupMenu(this,"KpopupKardChooser");
_popUpKardChooser = new TDEPopupMenu(this,"KpopupKardChooser");
_popUpKardChooser->insertItem(i18n("Change Module..."),
this,
TQT_SLOT(slotLaunchChooser()));
@ -145,16 +145,16 @@ void KSmartcardConfig::updateReadersState (TQString readerName,
bool isCardPresent,
TQString atr) {
KListViewItem * tID=(KListViewItem *) base->_readerHostsListView->findItem(readerName, 0);
TDEListViewItem * tID=(TDEListViewItem *) base->_readerHostsListView->findItem(readerName, 0);
if (tID==0) return;
KListViewItem * tIDChild=(KListViewItem*) tID->firstChild();
TDEListViewItem * tIDChild=(TDEListViewItem*) tID->firstChild();
if (tIDChild==NULL) return;
delete tIDChild;
if (!isCardPresent)
(void) new KListViewItem(tID,i18n("No card inserted"));
(void) new TDEListViewItem(tID,i18n("No card inserted"));
else{
getSupportingModule(tID,atr);
@ -175,7 +175,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
arg << modName;
// New view items
KListViewItem * temp;
TDEListViewItem * temp;
//If the smartcard support is disabled we unload the kardsvc KDED module
// and return
@ -188,11 +188,11 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
// New view items
KListViewItem * temp;
TDEListViewItem * temp;
kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
data, rettype, retval);
(void) new KListViewItem(base->_readerHostsListView,
(void) new TDEListViewItem(base->_readerHostsListView,
i18n("Smart card support disabled"));
@ -203,14 +203,14 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
if (lr.isEmpty()){
(void) new KListViewItem(base->_readerHostsListView,
(void) new TDEListViewItem(base->_readerHostsListView,
i18n("No readers found. Check 'pcscd' is running"));
return;
}
for (TQStringList::Iterator _slot=lr.begin();_slot!=lr.end();++_slot){
temp= new KListViewItem(base->_readerHostsListView,*_slot);
temp= new TDEListViewItem(base->_readerHostsListView,*_slot);
TQByteArray dataATR;
@ -227,7 +227,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
if (cardATR.isNull()){
(void) new KListViewItem(temp,i18n("NO ATR or no card inserted"));
(void) new TDEListViewItem(temp,i18n("NO ATR or no card inserted"));
continue;
}
@ -241,13 +241,13 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
}
void KSmartcardConfig::getSupportingModule( KListViewItem * ant,
void KSmartcardConfig::getSupportingModule( TDEListViewItem * ant,
TQString & cardATR) const{
if (cardATR.isNull()){
(void) new KListViewItem(ant,i18n("NO ATR or no card inserted"));
(void) new TDEListViewItem(ant,i18n("NO ATR or no card inserted"));
return;
}
@ -258,7 +258,7 @@ void KSmartcardConfig::getSupportingModule( KListViewItem * ant,
TQString type=mng[0];
TQString subType=mng[1];
TQString subSubType=mng[2];
KListViewItem * hil =new KListViewItem(ant,
TDEListViewItem * hil =new TDEListViewItem(ant,
i18n("Managed by: "),
type,
subType,
@ -268,7 +268,7 @@ void KSmartcardConfig::getSupportingModule( KListViewItem * ant,
else{
KListViewItem * hil =new KListViewItem(ant,
TDEListViewItem * hil =new TDEListViewItem(ant,
i18n("No module managing this card"));
hil->setSelectable(FALSE);
}

8
kcontrol/smartcard/smartcard.h
Unescape Escape View File

@ -34,8 +34,8 @@
class TDEConfig;
class KCardDB;
class KPopupMenu;
class KListViewItem;
class TDEPopupMenu;
class TDEListViewItem;
class KSmartcardConfig : public TDECModule, public DCOPObject
{
@ -77,9 +77,9 @@ private:
TDEConfig *config;
bool _ok;
KCardDB * _cardDB;
KPopupMenu * _popUpKardChooser;
TDEPopupMenu * _popUpKardChooser;
void getSupportingModule( KListViewItem * ant,
void getSupportingModule( TDEListViewItem * ant,
TQString & cardATR) const ;

2
kcontrol/smartcard/smartcardbase.ui
Unescape Escape View File

@ -146,7 +146,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="KListView">
<widget class="TDEListView">
<column>
<property name="text">
<string>Reader</string>

2
kcontrol/style/kcmstyle.cpp
Unescape Escape View File

@ -648,7 +648,7 @@ void KCMStyle::save()
if ( m_bToolbarsDirty )
// ##### FIXME - Doesn't apply all settings correctly due to bugs in
// TDEApplication/KToolbar
// TDEApplication/TDEToolbar
KIPC::sendMessageAll(KIPC::ToolbarStyleChanged);
if (m_bEffectsDirty) {

4
kcontrol/tdeio/kcookiesmanagementdlg_ui.ui
Unescape Escape View File

@ -27,7 +27,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="KListView" row="1" column="0">
<widget class="TDEListView" row="1" column="0">
<column>
<property name="text">
<string>Domain [Group]</string>
@ -158,7 +158,7 @@
<cstring>kListViewSearchLine</cstring>
</property>
</widget>
<widget class="KListViewSearchLine">
<widget class="TDEListViewSearchLine">
<property name="name">
<cstring>kListViewSearchLine</cstring>
</property>

4
kcontrol/tdeio/kcookiespolicies.cpp
Unescape Escape View File

@ -53,8 +53,8 @@ KCookiesPolicies::KCookiesPolicies(TQWidget *parent)
dlg = new KCookiesPolicyDlgUI (this);
dlg->lvDomainPolicy->header()->setStretchEnabled(true, 0);
dlg->lvDomainPolicy->setColumnWidthMode(0, KListView::Manual);
dlg->lvDomainPolicy->setColumnWidthMode(1, KListView::Maximum);
dlg->lvDomainPolicy->setColumnWidthMode(0, TDEListView::Manual);
dlg->lvDomainPolicy->setColumnWidthMode(1, TDEListView::Maximum);
dlg->tbClearSearchLine->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
dlg->kListViewSearchLine->setListView(dlg->lvDomainPolicy);
TQValueList<int> columns;

4
kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
Unescape Escape View File

@ -210,7 +210,7 @@ To add a new policy, simply click on the &lt;b&gt;Add...&lt;/b&gt; button and su
</widget>
</vbox>
</widget>
<widget class="KListView" row="1" column="0" rowspan="2" colspan="1">
<widget class="TDEListView" row="1" column="0" rowspan="2" colspan="1">
<column>
<property name="text">
<string>Domain</string>
@ -284,7 +284,7 @@ List of sites for which you have set a specific cookie policy. Specific policies
<cstring>kListViewSearchLine</cstring>
</property>
</widget>
<widget class="KListViewSearchLine">
<widget class="TDEListViewSearchLine">
<property name="name">
<cstring>kListViewSearchLine</cstring>
</property>

2
kcontrol/tdeio/manualproxy_ui.ui
Unescape Escape View File

@ -287,7 +287,7 @@ Reverse the use of the exception list. Checking this box will result in the prox
</size>
</property>
</spacer>
<widget class="KListBox" row="0" column="0" rowspan="5" colspan="1">
<widget class="TDEListBox" row="0" column="0" rowspan="5" colspan="1">
<property name="name">
<cstring>lbExceptions</cstring>
</property>

2
kcontrol/tdeio/useragentdlg_ui.ui
Unescape Escape View File

@ -192,7 +192,7 @@ By default, only minimal identification information is sent to remote sites. The
<property name="margin">
<number>11</number>
</property>
<widget class="KListView">
<widget class="TDEListView">
<column>
<property name="text">
<string>Site Name</string>

2
kcontrol/tdm/tdm-conv.cpp
Unescape Escape View File

@ -134,7 +134,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
connect(npGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
pl_label = new TQLabel(i18n("No password re&quired for:"), npGroup);
npuserlv = new KListView(npGroup);
npuserlv = new TDEListView(npGroup);
pl_label->setBuddy(npuserlv);
npuserlv->addColumn(TQString::null);
npuserlv->header()->hide();

2
kcontrol/tdm/tdm-conv.h
Unescape Escape View File

@ -73,7 +73,7 @@ private:
TQRadioButton *npRadio, *ppRadio, *spRadio;
KComboBox *userlb, *puserlb;
TQSpinBox *delaysb;
KListView *npuserlv;
TDEListView *npuserlv;
TQLabel *u_label, *d_label, *pu_label, *w_label, *n_label, *pl_label;
TQString autoUser, preselUser;
TQStringList noPassUsers;

6
kcontrol/tdm/tdm-font.cpp
Unescape Escape View File

@ -44,7 +44,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
{
TQGridLayout *ml = new TQGridLayout(this, 5, 2, KDialog::marginHint(), KDialog::spacingHint());
TQLabel *label = new TQLabel(i18n("&General:"), this);
stdFontChooser = new KFontRequester(this);
stdFontChooser = new TDEFontRequester(this);
label->setBuddy(stdFontChooser);
TQWhatsThis::add( stdFontChooser, i18n("This changes the font which is used for all the text in the login manager except for the greeting and failure messages.") );
connect(stdFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
@ -52,7 +52,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
ml->addWidget(stdFontChooser, 1, 1);
label = new TQLabel(i18n("&Failures:"), this);
failFontChooser = new KFontRequester(this);
failFontChooser = new TDEFontRequester(this);
label->setBuddy(failFontChooser);
TQWhatsThis::add( failFontChooser, i18n("This changes the font which is used for failure messages in the login manager.") );
connect(failFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
@ -60,7 +60,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
ml->addWidget(failFontChooser, 2, 1);
label = new TQLabel(i18n("Gree&ting:"), this);
greetingFontChooser = new KFontRequester(this);
greetingFontChooser = new TDEFontRequester(this);
label->setBuddy(greetingFontChooser);
TQWhatsThis::add( greetingFontChooser, i18n("This changes the font which is used for the login manager's greeting.") );
connect(greetingFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));

8
kcontrol/tdm/tdm-font.h
Unescape Escape View File

@ -22,7 +22,7 @@
#include <tqwidget.h>
class KFontRequester;
class TDEFontRequester;
class TQCheckBox;
class TDMFontWidget : public TQWidget
@ -46,9 +46,9 @@ protected slots:
private:
TQCheckBox *aacb;
KFontRequester *greetingFontChooser;
KFontRequester *failFontChooser;
KFontRequester *stdFontChooser;
TDEFontRequester *greetingFontChooser;
TDEFontRequester *failFontChooser;
TDEFontRequester *stdFontChooser;
};

4
kcontrol/tdm/tdm-users.cpp
Unescape Escape View File

@ -127,7 +127,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
wstack = new TQWidgetStack( this );
s_label = new TQLabel( wstack, i18n("S&elect users and groups:"), this );
optinlv = new KListView( this );
optinlv = new TDEListView( this );
optinlv->addColumn( i18n("Selected Users") );
optinlv->setResizeMode( TQListView::LastColumn );
TQWhatsThis::add( optinlv, i18n("TDM will show all checked users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") );
@ -136,7 +136,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
TQT_SLOT(slotUpdateOptIn( TQListViewItem * )) );
connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )),
TQT_SLOT(slotChanged()) );
optoutlv = new KListView( this );
optoutlv = new TDEListView( this );
optoutlv->addColumn( i18n("Hidden Users") );
optoutlv->setResizeMode( TQListView::LastColumn );
TQWhatsThis::add( optoutlv, i18n("TDM will show all non-checked non-system users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") );

2
kcontrol/tdm/tdm-users.h
Unescape Escape View File

@ -84,7 +84,7 @@ private:
TQLabel *s_label; // middle
TQWidgetStack *wstack;
KListView *optoutlv, *optinlv;
TDEListView *optoutlv, *optinlv;
TQButtonGroup *faceGroup; // right
TQRadioButton *rbadmonly, *rbprefadm, *rbprefusr, *rbusronly;

2
kdcop/kdcoplistview.cpp
Unescape Escape View File

@ -13,7 +13,7 @@
KDCOPListView::KDCOPListView ( TQWidget *parent, const char *name)
: KListView(parent, name)
: TDEListView(parent, name)
{
kdDebug() << "Building new list." << endl;
setDragEnabled(true);

2
kdcop/kdcoplistview.h
Unescape Escape View File

@ -11,7 +11,7 @@
#include <klistview.h>
class TQDragObject;
class KDCOPListView : public KListView
class KDCOPListView : public TDEListView
{
Q_OBJECT

4
kdcop/kdcopview.ui
Unescape Escape View File

@ -20,7 +20,7 @@
<property name="margin">
<number>0</number>
</property>
<widget class="KListViewSearchLine" row="0" column="1">
<widget class="TDEListViewSearchLine" row="0" column="1">
<property name="name">
<cstring>kListViewSearchLine1</cstring>
</property>
@ -81,7 +81,7 @@
<number>0</number>
</property>
</widget>
<widget class="KListBox" row="1" column="0" rowspan="1" colspan="2">
<widget class="TDEListBox" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>lb_replyData</cstring>
</property>

8
kdcop/kdcopwindow.cpp
Unescape Escape View File

@ -280,7 +280,7 @@ DCOPBrowserFunctionItem::setOpen(bool o)
// ------------------------------------------------------------------------
KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
: KMainWindow(parent, name)
: TDEMainWindow(parent, name)
{
dcopClient = kapp->dcopClient();
dcopClient->attach();
@ -317,10 +317,10 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() );
(void) new KAction( i18n( "&Reload" ), "reload", KStdAccel::shortcut(KStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );
(void) new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );
exeaction =
new KAction
new TDEAction
(
i18n("&Execute"),
"exec",
@ -334,7 +334,7 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
exeaction->setEnabled(false);
exeaction->setToolTip(i18n("Execute the selected DCOP call."));
langmode = new KSelectAction ( i18n("Language Mode"),
langmode = new TDESelectAction ( i18n("Language Mode"),
CTRL + Key_M,
TQT_TQOBJECT(this),
TQT_SLOT(slotMode()),

10
kdcop/kdcopwindow.h
Unescape Escape View File

@ -9,8 +9,8 @@
class DCOPClient;
class TQListViewItem;
class KAction;
class KSelectAction;
class TDEAction;
class TDESelectAction;
class TQWidgetStack;
class TQLabel;
class KDCOPListView;
@ -19,7 +19,7 @@ class KDCOPListView;
#include "kdcoplistview.h"
#include "kdcopview.h"
class KDCOPWindow : public KMainWindow
class KDCOPWindow : public TDEMainWindow
{
Q_OBJECT
@ -53,8 +53,8 @@ class KDCOPWindow : public KMainWindow
bool demarshal(TQCString & replyType, TQDataStream & reply, TQListBox *theList);
DCOPClient * dcopClient;
KAction * exeaction;
KSelectAction * langmode;
TDEAction * exeaction;
TDESelectAction * langmode;
kdcopview * mainView;
TQVBoxLayout * mainLayout;
};

14
kdebugdialog/klistdebugdialog.cpp
Unescape Escape View File

@ -30,7 +30,7 @@
#include <klineedit.h>
#include <dcopclient.h>
KListDebugDialog::KListDebugDialog( TQStringList areaList, TQWidget *parent, const char *name, bool modal )
TDEListDebugDialog::TDEListDebugDialog( TQStringList areaList, TQWidget *parent, const char *name, bool modal )
: KAbstractDebugDialog( parent, name, modal ),
m_areaList( areaList )
{
@ -65,7 +65,7 @@ KListDebugDialog::KListDebugDialog( TQStringList areaList, TQWidget *parent, con
resize( 350, 400 );
}
void KListDebugDialog::generateCheckBoxes( const TQString& filter )
void TDEListDebugDialog::generateCheckBoxes( const TQString& filter )
{
TQPtrListIterator<TQCheckBox> cb_it ( boxes );
for( ; cb_it.current() ; ++cb_it )
@ -102,7 +102,7 @@ void KListDebugDialog::generateCheckBoxes( const TQString& filter )
load();
}
void KListDebugDialog::selectAll()
void TDEListDebugDialog::selectAll()
{
TQPtrListIterator<TQCheckBox> it ( boxes );
for ( ; it.current() ; ++it ) {
@ -111,7 +111,7 @@ void KListDebugDialog::selectAll()
}
}
void KListDebugDialog::deSelectAll()
void TDEListDebugDialog::deSelectAll()
{
TQPtrListIterator<TQCheckBox> it ( boxes );
for ( ; it.current() ; ++it ) {
@ -120,7 +120,7 @@ void KListDebugDialog::deSelectAll()
}
}
void KListDebugDialog::load()
void TDEListDebugDialog::load()
{
TQPtrListIterator<TQCheckBox> it ( boxes );
for ( ; it.current() ; ++it )
@ -152,7 +152,7 @@ void KListDebugDialog::load()
}
}
void KListDebugDialog::save()
void TDEListDebugDialog::save()
{
TQPtrListIterator<TQCheckBox> it ( boxes );
for ( ; it.current() ; ++it )
@ -176,7 +176,7 @@ void KListDebugDialog::save()
m_changes.clear();
}
void KListDebugDialog::activateArea( TQCString area, bool activate )
void TDEListDebugDialog::activateArea( TQCString area, bool activate )
{
TQPtrListIterator<TQCheckBox> it ( boxes );
for ( ; it.current() ; ++it )

6
kdebugdialog/klistdebugdialog.h
Unescape Escape View File

@ -35,13 +35,13 @@ class KLineEdit;
*
* @author David Faure <faure@kde.org>
*/
class KListDebugDialog : public KAbstractDebugDialog
class TDEListDebugDialog : public KAbstractDebugDialog
{
Q_OBJECT
public:
KListDebugDialog( TQStringList areaList, TQWidget *parent=0, const char *name=0, bool modal=true );
virtual ~KListDebugDialog() {}
TDEListDebugDialog( TQStringList areaList, TQWidget *parent=0, const char *name=0, bool modal=true );
virtual ~TDEListDebugDialog() {}
void activateArea( TQCString area, bool activate );

2
kdebugdialog/main.cpp
Unescape Escape View File

@ -94,7 +94,7 @@ int main(int argc, char ** argv)
dialog = new KDebugDialog(areaList, 0L);
else
{
KListDebugDialog * listdialog = new KListDebugDialog(areaList, 0L);
TDEListDebugDialog * listdialog = new TDEListDebugDialog(areaList, 0L);
if (args->isSet("on"))
{
listdialog->activateArea( args->getOption("on"), true );

2
kdesktop/bgmanager.h
Unescape Escape View File

@ -22,7 +22,7 @@
class TDEConfig;
class TQTimer;
class TQPixmap;
class KPopupMenu;
class TDEPopupMenu;
class KWinModule;
class KPixmap;
class KVirtualBGRenderer;

12
kdesktop/desktop.cc
Unescape Escape View File

@ -62,7 +62,7 @@
#include <kpopupmenu.h>
#include <kapplication.h>
#include <kdirlister.h>
// Create the equivalent of KAccelBase::connectItem
// Create the equivalent of TDEAccelBase::connectItem
// and then remove this include and fix reconnects in initRoot() -- ellis
//#include <kaccelbase.h>
@ -454,8 +454,8 @@ void KDesktop::initConfig()
keys->updateConnections();
}
KLaunchSettings::self()->readConfig();
if( !KLaunchSettings::busyCursor() )
TDELaunchSettings::self()->readConfig();
if( !TDELaunchSettings::busyCursor() )
{
delete startup_id;
startup_id = NULL;
@ -748,7 +748,7 @@ void KDesktop::toggleShowDesktop()
setShowDesktop(!showDesktopState());
}
KActionCollection * KDesktop::actionCollection()
TDEActionCollection * KDesktop::actionCollection()
{
if (!m_pIconView)
return 0;
@ -929,7 +929,7 @@ void KDesktop::slotSwitchDesktops(int delta)
void KDesktop::handleColorDropEvent(TQDropEvent * e)
{
KPopupMenu popup;
TDEPopupMenu popup;
popup.insertItem(SmallIconSet("colors"),i18n("Set as Primary Background Color"), 1);
popup.insertItem(SmallIconSet("colors"),i18n("Set as Secondary Background Color"), 2);
int result = popup.exec(e->pos());
@ -946,7 +946,7 @@ void KDesktop::handleColorDropEvent(TQDropEvent * e)
void KDesktop::handleImageDropEvent(TQDropEvent * e)
{
KPopupMenu popup;
TDEPopupMenu popup;
if ( m_pIconView )
popup.insertItem(SmallIconSet("filesave"),i18n("&Save to Desktop..."), 1);
if ( ( m_pIconView && m_pIconView->maySetWallpaper() ) || m_pRootWidget )

4
kdesktop/desktop.h
Unescape Escape View File

@ -39,7 +39,7 @@ class TQTimer;
class StartupId;
class KDIconView;
class Minicli;
class KActionCollection;
class TDEActionCollection;
class KRootWidget : public TQObject
{
@ -99,7 +99,7 @@ public:
KWinModule* twinModule() const { return m_pKwinmodule; }
// The action collection of the active widget
KActionCollection *actionCollection();
TDEActionCollection *actionCollection();
// The URL (for the File/New menu)
KURL url() const;

34
kdesktop/kdiconview.cc
Unescape Escape View File

@ -418,35 +418,35 @@ void KDIconView::createActions()
{
if (m_bEditableDesktopIcons)
{
KAction *undo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), &m_actionCollection, "undo" );
TDEAction *undo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), &m_actionCollection, "undo" );
connect( KonqUndoManager::self(), TQT_SIGNAL( undoAvailable( bool ) ),
undo, TQT_SLOT( setEnabled( bool ) ) );
connect( KonqUndoManager::self(), TQT_SIGNAL( undoTextChanged( const TQString & ) ),
undo, TQT_SLOT( setText( const TQString & ) ) );
undo->setEnabled( KonqUndoManager::self()->undoAvailable() );
KAction* paCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), &m_actionCollection, "cut" );
KShortcut cutShortCut = paCut->shortcut();
TDEAction* paCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), &m_actionCollection, "cut" );
TDEShortcut cutShortCut = paCut->shortcut();
cutShortCut.remove( KKey( SHIFT + Key_Delete ) ); // used for deleting files
paCut->setShortcut( cutShortCut );
KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), &m_actionCollection, "copy" );
KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), &m_actionCollection, "paste" );
KAction *pasteTo = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" );
TDEAction *pasteTo = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" );
pasteTo->setEnabled( false ); // only enabled during popupMenu()
KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload);
new KAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" );
TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload);
new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" );
(void) new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
(void) new KAction( i18n( "&Properties" ), ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" );
KAction* trash = new KAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, &m_actionCollection, "trash" );
connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ),
this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) );
(void) new TDEAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
(void) new TDEAction( i18n( "&Properties" ), ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" );
TDEAction* trash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, &m_actionCollection, "trash" );
connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
TDEConfig config("kdeglobals", true, false);
config.setGroup( "KDE" );
(void) new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
(void) new TDEAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
// Initial state of the actions (cut/copy/paste/...)
slotSelectionChanged();
@ -870,12 +870,12 @@ bool KDIconView::deleteGlobalDesktopFiles()
return !itemsLeft;
}
void KDIconView::slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state )
void KDIconView::slotTrashActivated( TDEAction::ActivationReason reason, TQt::ButtonState state )
{
if (deleteGlobalDesktopFiles())
return; // All items deleted
if ( reason == KAction::PopupMenuActivation && ( state & TQt::ShiftButton ) )
if ( reason == TDEAction::PopupMenuActivation && ( state & TQt::ShiftButton ) )
KonqOperations::del(this, KonqOperations::DEL, selectedUrls());
else
KonqOperations::del(this, KonqOperations::TRASH, selectedUrls());
@ -899,7 +899,7 @@ void KDIconView::popupMenu( const TQPoint &_global, const KFileItemList& _items
if ( _items.count() == 1 )
m_popupURL = _items.getFirst()->url();
KAction* pasteTo = m_actionCollection.action( "pasteto" );
TDEAction* pasteTo = m_actionCollection.action( "pasteto" );
if (pasteTo)
pasteTo->setEnabled( m_actionCollection.action( "paste" )->isEnabled() );
@ -945,7 +945,7 @@ void KDIconView::slotEnableAction( const char * name, bool enabled )
if ( sName == "properties" || sName == "editMimeType" )
return;
KAction * act = m_actionCollection.action( sName.data() );
TDEAction * act = m_actionCollection.action( sName.data() );
if (act)
act->setEnabled( enabled );
}
@ -1409,7 +1409,7 @@ void KDIconView::slotClipboardDataChanged()
TQString actionText = TDEIO::pasteActionText();
bool paste = !actionText.isEmpty();
if ( paste ) {
KAction* pasteAction = m_actionCollection.action( "paste" );
TDEAction* pasteAction = m_actionCollection.action( "paste" );
if ( pasteAction )
pasteAction->setText( actionText );
}

12
kdesktop/kdiconview.h
Unescape Escape View File

@ -33,7 +33,7 @@
class KDirLister;
class KonqSettings;
class KSimpleConfig;
class KAccel;
class TDEAccel;
class KShadowEngine;
class KDesktopShadowSettings;
@ -60,7 +60,7 @@ public:
*/
void start();
KActionCollection *actionCollection() { return &m_actionCollection; }
TDEActionCollection *actionCollection() { return &m_actionCollection; }
enum SortCriterion {
NameCaseSensitive = 0, NameCaseInsensitive, Size, Type, Date };
@ -138,7 +138,7 @@ protected slots:
// slots connected to the popupmenu (actions)
void slotCut();
void slotCopy();
void slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state );
void slotTrashActivated( TDEAction::ActivationReason reason, TQt::ButtonState state );
void slotDelete();
void slotPopupPasteTo();
void slotProperties();
@ -200,10 +200,10 @@ private:
static void readIconPosition(KSimpleConfig *config, int &x, int &y);
/** Our action collection, parent of all our actions */
KActionCollection m_actionCollection;
TDEActionCollection m_actionCollection;
/** KAccel object, to make the actions shortcuts work */
KAccel *m_accel;
/** TDEAccel object, to make the actions shortcuts work */
TDEAccel *m_accel;
bool m_bNeedRepaint;
bool m_bNeedSave;

2
kdesktop/klaunchsettings.kcfgc
Unescape Escape View File

@ -1,4 +1,4 @@
File=klaunch.kcfg
ClassName=KLaunchSettings
ClassName=TDELaunchSettings
Singleton=true
Mutators=true

74
kdesktop/krootwm.cc
Unescape Escape View File

@ -72,7 +72,7 @@ extern TQCString kdesktop_name, kicker_name, twin_name;
KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
{
s_rootWm = this;
m_actionCollection = new KActionCollection(_desktop, this, "KRootWm::m_actionCollection");
m_actionCollection = new TDEActionCollection(_desktop, this, "KRootWm::m_actionCollection");
m_pDesktop = _desktop;
m_bDesktopEnabled = (m_pDesktop->iconView() != 0);
customMenu1 = 0;
@ -92,9 +92,9 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
m_pDesktop->iconView(), TQT_SLOT( slotNewMenuActivated() ) );
}
if (kapp->authorizeKAction("bookmarks"))
if (kapp->authorizeTDEAction("bookmarks"))
{
bookmarks = new KActionMenu( i18n("Bookmarks"), "bookmark", m_actionCollection, "bookmarks" );
bookmarks = new TDEActionMenu( i18n("Bookmarks"), "bookmark", m_actionCollection, "bookmarks" );
// The KBookmarkMenu is needed to fill the Bookmarks menu in the desktop menubar.
bookmarkMenu = new KBookmarkMenu( KonqBookmarkManager::self(), new KBookmarkOwner(),
bookmarks->popupMenu(),
@ -119,8 +119,8 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
if (m_bDesktopEnabled)
{
// Don't do that! One action in two parent collections means some invalid write
// during the second ~KActionCollection.
KAction *action = m_pDesktop->actionCollection()->action( "paste" );
// during the second ~TDEActionCollection.
TDEAction *action = m_pDesktop->actionCollection()->action( "paste" );
if (action)
m_actionCollection->insert( action );
action = m_pDesktop->actionCollection()->action( "undo" );
@ -131,79 +131,79 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
if (kapp->authorize("run_command"))
{
new KAction(i18n("Run Command..."), "run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
new KAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
new TDEAction(i18n("Run Command..."), "run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
m_actionCollection, "open_terminal" );
}
if (!TDEGlobal::config()->isImmutable())
{
new KAction(i18n("Configure Desktop..."), "configure", 0, this, TQT_SLOT( slotConfigureDesktop() ),
new TDEAction(i18n("Configure Desktop..."), "configure", 0, this, TQT_SLOT( slotConfigureDesktop() ),
m_actionCollection, "configdesktop" );
new KAction(i18n("Disable Desktop Menu"), 0, this, TQT_SLOT( slotToggleDesktopMenu() ),
new TDEAction(i18n("Disable Desktop Menu"), 0, this, TQT_SLOT( slotToggleDesktopMenu() ),
m_actionCollection, "togglemenubar" );
}
new KAction(i18n("Unclutter Windows"), 0, this, TQT_SLOT( slotUnclutterWindows() ),
new TDEAction(i18n("Unclutter Windows"), 0, this, TQT_SLOT( slotUnclutterWindows() ),
m_actionCollection, "unclutter" );
new KAction(i18n("Cascade Windows"), 0, this, TQT_SLOT( slotCascadeWindows() ),
new TDEAction(i18n("Cascade Windows"), 0, this, TQT_SLOT( slotCascadeWindows() ),
m_actionCollection, "cascade" );
// arrange menu actions
if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons"))
{
new KAction(i18n("By Name (Case Sensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCS() ),
new TDEAction(i18n("By Name (Case Sensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCS() ),
m_actionCollection, "sort_ncs");
new KAction(i18n("By Name (Case Insensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCI() ),
new TDEAction(i18n("By Name (Case Insensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCI() ),
m_actionCollection, "sort_nci");
new KAction(i18n("By Size"), 0, this, TQT_SLOT( slotArrangeBySize() ),
new TDEAction(i18n("By Size"), 0, this, TQT_SLOT( slotArrangeBySize() ),
m_actionCollection, "sort_size");
new KAction(i18n("By Type"), 0, this, TQT_SLOT( slotArrangeByType() ),
new TDEAction(i18n("By Type"), 0, this, TQT_SLOT( slotArrangeByType() ),
m_actionCollection, "sort_type");
new KAction(i18n("By Date"), 0, this, TQT_SLOT( slotArrangeByDate() ),
new TDEAction(i18n("By Date"), 0, this, TQT_SLOT( slotArrangeByDate() ),
m_actionCollection, "sort_date");
KToggleAction *aSortDirsFirst = new KToggleAction( i18n("Directories First"), 0, m_actionCollection, "sort_directoriesfirst" );
TDEToggleAction *aSortDirsFirst = new TDEToggleAction( i18n("Directories First"), 0, m_actionCollection, "sort_directoriesfirst" );
connect( aSortDirsFirst, TQT_SIGNAL( toggled( bool ) ),
this, TQT_SLOT( slotToggleDirFirst( bool ) ) );
new KAction(i18n("Line Up Horizontally"), 0,
new TDEAction(i18n("Line Up Horizontally"), 0,
this, TQT_SLOT( slotLineupIconsHoriz() ),
m_actionCollection, "lineupHoriz" );
new KAction(i18n("Line Up Vertically"), 0,
new TDEAction(i18n("Line Up Vertically"), 0,
this, TQT_SLOT( slotLineupIconsVert() ),
m_actionCollection, "lineupVert" );
KToggleAction *aAutoAlign = new KToggleAction(i18n("Align to Grid"), 0,
TDEToggleAction *aAutoAlign = new TDEToggleAction(i18n("Align to Grid"), 0,
m_actionCollection, "realign" );
connect( aAutoAlign, TQT_SIGNAL( toggled( bool ) ),
this, TQT_SLOT( slotToggleAutoAlign( bool ) ) );
KToggleAction *aLockIcons = new KToggleAction(i18n("Lock in Place"), 0, m_actionCollection, "lock_icons");
TDEToggleAction *aLockIcons = new TDEToggleAction(i18n("Lock in Place"), 0, m_actionCollection, "lock_icons");
connect( aLockIcons, TQT_SIGNAL( toggled( bool ) ),
this, TQT_SLOT( slotToggleLockIcons( bool ) ) );
}
if (m_bDesktopEnabled)
{
new KAction(i18n("Refresh Desktop"), "desktop", 0, this, TQT_SLOT( slotRefreshDesktop() ),
new TDEAction(i18n("Refresh Desktop"), "desktop", 0, this, TQT_SLOT( slotRefreshDesktop() ),
m_actionCollection, "refresh" );
}
// Icons in sync with kicker
if (kapp->authorize("lock_screen"))
{
new KAction(i18n("Lock Session"), "lock", 0, this, TQT_SLOT( slotLock() ),
new TDEAction(i18n("Lock Session"), "lock", 0, this, TQT_SLOT( slotLock() ),
m_actionCollection, "lock" );
}
if (kapp->authorize("logout"))
{
new KAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "exit", 0,
new TDEAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "exit", 0,
this, TQT_SLOT( slotLogout() ), m_actionCollection, "logout" );
}
if (kapp->authorize("start_new_session") && DM().isSwitchable())
{
new KAction(i18n("Start New Session"), "fork", 0, this,
new TDEAction(i18n("Start New Session"), "fork", 0, this,
TQT_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
if (kapp->authorize("lock_screen"))
{
new KAction(i18n("Lock Current && Start New Session"), "lock", 0, this,
new TDEAction(i18n("Lock Current && Start New Session"), "lock", 0, this,
TQT_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" );
}
}
@ -248,14 +248,14 @@ void KRootWm::initConfig()
m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() );
if ( kapp->authorize( "editable_desktop_icons" ) ) {
m_pDesktop->iconView()->setItemsMovable( !KDesktopSettings::lockIcons() );
KToggleAction *aLockIcons = static_cast<KToggleAction*>(m_actionCollection->action("lock_icons"));
TDEToggleAction *aLockIcons = static_cast<TDEToggleAction*>(m_actionCollection->action("lock_icons"));
if (aLockIcons)
aLockIcons->setChecked( KDesktopSettings::lockIcons() );
}
KToggleAction *aAutoAlign = static_cast<KToggleAction*>(m_actionCollection->action("realign"));
TDEToggleAction *aAutoAlign = static_cast<TDEToggleAction*>(m_actionCollection->action("realign"));
if (aAutoAlign)
aAutoAlign->setChecked( KDesktopSettings::autoLineUpIcons() );
KToggleAction *aSortDirsFirst = static_cast<KToggleAction*>(m_actionCollection->action("sort_directoriesfirst"));
TDEToggleAction *aSortDirsFirst = static_cast<TDEToggleAction*>(m_actionCollection->action("sort_directoriesfirst"));
if (aSortDirsFirst)
aSortDirsFirst->setChecked( KDesktopSettings::sortDirectoriesFirst() );
}
@ -285,7 +285,7 @@ void KRootWm::buildMenus()
// create Arrange menu
TQPopupMenu *pArrangeMenu = 0;
TQPopupMenu *pLineupMenu = 0;
KAction *action;
TDEAction *action;
help = new KHelpMenu(0, 0, false);
help->menu()->removeItem( KHelpMenu::menuAboutApp );
@ -437,7 +437,7 @@ void KRootWm::buildMenus()
m_actionCollection->action( "lineupVert" )->plug( pIconOperationsMenu );
pIconOperationsMenu->insertSeparator();
m_actionCollection->action( "realign" )->plug( pIconOperationsMenu );
KAction *aLockIcons = m_actionCollection->action( "lock_icons" );
TDEAction *aLockIcons = m_actionCollection->action( "lock_icons" );
if ( aLockIcons )
aLockIcons->plug( pIconOperationsMenu );
@ -665,7 +665,7 @@ void KRootWm::slotArrangeByNameCS()
{
if (m_bDesktopEnabled)
{
bool b = static_cast<KToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked();
bool b = static_cast<TDEToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked();
m_pDesktop->iconView()->rearrangeIcons( KDIconView::NameCaseSensitive, b);
}
}
@ -674,7 +674,7 @@ void KRootWm::slotArrangeByNameCI()
{
if (m_bDesktopEnabled)
{
bool b = static_cast<KToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked();
bool b = static_cast<TDEToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked();
m_pDesktop->iconView()->rearrangeIcons( KDIconView::NameCaseInsensitive, b);
}
}
@ -683,7 +683,7 @@ void KRootWm::slotArrangeBySize()
{
if (m_bDesktopEnabled)
{
bool b = static_cast<KToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked();
bool b = static_cast<TDEToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked();
m_pDesktop->iconView()->rearrangeIcons( KDIconView::Size, b);
}
}
@ -692,7 +692,7 @@ void KRootWm::slotArrangeByDate()
{
if (m_bDesktopEnabled)
{
bool b = static_cast<KToggleAction *>( m_actionCollection->action( "sort_directoriesfirst" ) )->isChecked();
bool b = static_cast<TDEToggleAction *>( m_actionCollection->action( "sort_directoriesfirst" ) )->isChecked();
m_pDesktop->iconView()->rearrangeIcons( KDIconView::Date, b );
}
}
@ -701,7 +701,7 @@ void KRootWm::slotArrangeByType()
{
if (m_bDesktopEnabled)
{
bool b = static_cast<KToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked();
bool b = static_cast<TDEToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked();
m_pDesktop->iconView()->rearrangeIcons( KDIconView::Type, b);
}
}
@ -835,7 +835,7 @@ void KRootWm::slotLogout() {
void KRootWm::slotPopulateSessions()
{
KAction *action;
TDEAction *action;
int p;
DM dm;

8
kdesktop/krootwm.h
Unescape Escape View File

@ -39,8 +39,8 @@ class KNewMenu;
class KWinModule;
class KBookmarkMenu;
class KHelpMenu;
class KActionCollection;
class KActionMenu;
class TDEActionCollection;
class TDEActionMenu;
class KWindowListMenu;
enum {
@ -141,9 +141,9 @@ private:
menuChoice rightButtonChoice;
KNewMenu* menuNew;
KActionMenu* bookmarks;
TDEActionMenu* bookmarks;
KBookmarkMenu* bookmarkMenu;
KActionCollection * m_actionCollection;
TDEActionCollection * m_actionCollection;
TQPoint m_desktopMenuPosition;
void activateMenu( menuChoice choice, const TQPoint& global );

2
kdesktop/main.cc
Unescape Escape View File

@ -280,7 +280,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
}
// for the KDE-already-running check in starttde
KSelectionOwner kde_running( "_KDE_RUNNING", 0 );
TDESelectionOwner kde_running( "_KDE_RUNNING", 0 );
kde_running.claim( false );
KDesktop desktop( x_root_hack, wait_for_kded );

4
kdesktop/pixmapserver.cc
Unescape Escape View File

@ -72,7 +72,7 @@ void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite)
pi.selection = sel;
m_Names[name] = pi;
KSelectionInode si;
TDESelectionInode si;
si.name = name;
si.handle = pm->handle();
m_Selections[sel] = si;
@ -163,7 +163,7 @@ bool KPixmapServer::x11Event(XEvent *event)
SelectionIterator it = m_Selections.find(sel);
if (it == m_Selections.end())
return false;
KSelectionInode si = it.data();
TDESelectionInode si = it.data();
// Only convert to pixmap
if (ev->target != pixmap)

6
kdesktop/pixmapserver.h
Unescape Escape View File

@ -35,7 +35,7 @@ struct KPixmapData
int refcount;
};
struct KSelectionInode
struct TDESelectionInode
{
Qt::HANDLE handle;
TQString name;
@ -110,12 +110,12 @@ private:
Atom pixmap;
TQMap<TQString,KPixmapInode> m_Names;
TQMap<Atom,KSelectionInode> m_Selections;
TQMap<Atom,TDESelectionInode> m_Selections;
TQMap<HANDLE,KPixmapData> m_Data;
TQMap<Atom,HANDLE> m_Active;
typedef TQMap<TQString,KPixmapInode>::Iterator NameIterator;
typedef TQMap<Atom,KSelectionInode>::Iterator SelectionIterator;
typedef TQMap<Atom,TDESelectionInode>::Iterator SelectionIterator;
typedef TQMap<HANDLE,KPixmapData>::Iterator DataIterator;
typedef TQMap<Atom,HANDLE>::Iterator AtomIterator;
};

6
kdesktop/startupid.cpp
Unescape Escape View File

@ -75,9 +75,9 @@ StartupId::~StartupId()
void StartupId::configure()
{
startup_info.setTimeout( KLaunchSettings::timeout());
blinking = KLaunchSettings::blinking();
bouncing = KLaunchSettings::bouncing();
startup_info.setTimeout( TDELaunchSettings::timeout());
blinking = TDELaunchSettings::blinking();
bouncing = TDELaunchSettings::bouncing();
}
void StartupId::gotNewStartup( const TDEStartupInfoId& id_P, const TDEStartupInfoData& data_P )

2
kdialog/kdialog.cpp
Unescape Escape View File

@ -512,7 +512,7 @@ static int directCommand(TDECmdLineArgs *args)
} else { // getsavefilename
TQString result = dlg.selectedFile();
if (!result.isEmpty()) {
KRecentDocument::add(result);
TDERecentDocument::add(result);
cout << result.local8Bit().data() << endl;
return 0;
}

8
kdialog/klistboxdialog.cpp
Unescape Escape View File

@ -26,7 +26,7 @@
#include "klocale.h"
KListBoxDialog::KListBoxDialog(TQString text, TQWidget *parent)
TDEListBoxDialog::TDEListBoxDialog(TQString text, TQWidget *parent)
: KDialogBase( parent, 0, true, TQString::null, Ok|Cancel, Ok, true )
{
TQVBox *page = makeVBoxMainWidget();
@ -38,13 +38,13 @@ KListBoxDialog::KListBoxDialog(TQString text, TQWidget *parent)
table->setFocus();
}
void KListBoxDialog::insertItem(const TQString& item)
void TDEListBoxDialog::insertItem(const TQString& item)
{
table->insertItem(item);
table->setCurrentItem(0);
}
void KListBoxDialog::setCurrentItem(const TQString& item)
void TDEListBoxDialog::setCurrentItem(const TQString& item)
{
for ( int i=0; i < (int) table->count(); i++ ) {
if ( table->text(i) == item ) {
@ -54,7 +54,7 @@ void KListBoxDialog::setCurrentItem(const TQString& item)
}
}
int KListBoxDialog::currentItem()
int TDEListBoxDialog::currentItem()
{
return table->currentItem();
}

6
kdialog/klistboxdialog.h
Unescape Escape View File

@ -23,14 +23,14 @@
#include <kdialogbase.h>
class KListBoxDialog : public KDialogBase
class TDEListBoxDialog : public KDialogBase
{
Q_OBJECT
public:
KListBoxDialog(TQString text, TQWidget *parent=0);
~KListBoxDialog() {};
TDEListBoxDialog(TQString text, TQWidget *parent=0);
~TDEListBoxDialog() {};
TQListBox &getTable() { return *table; };

6
kdialog/widgets.cpp
Unescape Escape View File

@ -175,7 +175,7 @@ bool Widgets::comboBox(TQWidget *parent, const TQString& title, const TQString&
bool Widgets::listBox(TQWidget *parent, const TQString& title, const TQString& text, const TQStringList& args,
const TQString& defaultEntry, TQString &result)
{
KListBoxDialog box(text,parent);
TDEListBoxDialog box(text,parent);
kapp->setTopWidget( &box );
box.setCaption(title);
@ -201,7 +201,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString&
result.clear();
KListBoxDialog box(text,parent);
TDEListBoxDialog box(text,parent);
TQListBox &table = box.getTable();
@ -245,7 +245,7 @@ bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString&
{
TQStringList entries, tags;
KListBoxDialog box(text,parent);
TDEListBoxDialog box(text,parent);
TQListBox &table = box.getTable();

2
kfind/ChangeLog
Unescape Escape View File

@ -88,7 +88,7 @@ ver. 0.3.3:
ver. 0.3.2:
o uses KTopLevelWidget and KToolBar
o uses KTopLevelWidget and TDEToolBar
o new documentations
ver. 0.3.1:

2
kfind/kdatecombo.cpp
Unescape Escape View File

@ -30,7 +30,7 @@ KDateCombo::KDateCombo(const TQDate & date, TQWidget *parent, const char *name)
void KDateCombo::initObject(const TQDate & date, TQWidget *, const char *)
{
clearValidator();
popupFrame = new KPopupFrame(this, "popupFrame");
popupFrame = new TDEPopupFrame(this, "popupFrame");
popupFrame->installEventFilter(this);
datePicker = new KDatePicker(popupFrame, date, "datePicker");
datePicker->setMinimumSize(datePicker->sizeHint());

4
kfind/kdatecombo.h
Unescape Escape View File

@ -16,7 +16,7 @@
*/
class KDatePicker;
class KPopupFrame;
class TDEPopupFrame;
class KDateCombo : public TQComboBox {
Q_OBJECT
@ -30,7 +30,7 @@ public:
bool setDate(const TQDate & newDate);
private:
KPopupFrame * popupFrame;
TDEPopupFrame * popupFrame;
KDatePicker * datePicker;
void initObject(const TQDate & date, TQWidget *parent, const char *name);

6
kfind/kfindpart.h
Unescape Escape View File

@ -31,9 +31,9 @@ class KQuery;
class TDEAboutData;
//added
class KonqPropsView;
class KAction;
class KToggleAction;
class KActionMenu;
class TDEAction;
class TDEToggleAction;
class TDEActionMenu;
class TQIconViewItem;
class IconViewBrowserExtension;
//end added

16
kfind/kfwin.cpp
Unescape Escape View File

@ -105,7 +105,7 @@ TQString KfFileLVI::key(int column, bool) const
}
KfindWindow::KfindWindow( TQWidget *parent, const char *name )
: KListView( parent, name )
: TDEListView( parent, name )
,m_baseDir("")
,m_menu(0)
{
@ -134,8 +134,8 @@ KfindWindow::KfindWindow( TQWidget *parent, const char *name )
connect( this, TQT_SIGNAL(selectionChanged()),
this, TQT_SLOT( selectionHasChanged() ));
connect(this, TQT_SIGNAL(contextMenu(KListView *, TQListViewItem*,const TQPoint&)),
this, TQT_SLOT(slotContextMenu(KListView *,TQListViewItem*,const TQPoint&)));
connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem*,const TQPoint&)),
this, TQT_SLOT(slotContextMenu(TDEListView *,TQListViewItem*,const TQPoint&)));
connect(this, TQT_SIGNAL(executed(TQListViewItem*)),
this, TQT_SLOT(slotExecute(TQListViewItem*)));
@ -330,10 +330,10 @@ void KfindWindow::slotExecute(TQListViewItem* item)
((KfFileLVI*)item)->fileitem.run();
}
// Resizes KListView to occupy all visible space
// Resizes TDEListView to occupy all visible space
void KfindWindow::resizeEvent(TQResizeEvent *e)
{
KListView::resizeEvent(e);
TDEListView::resizeEvent(e);
resetColumns(false);
clipper()->repaint();
}
@ -390,7 +390,7 @@ void KfindWindow::resetColumns(bool init)
setColumnWidth(1, dir_w);
}
void KfindWindow::slotContextMenu(KListView *,TQListViewItem *item,const TQPoint&p)
void KfindWindow::slotContextMenu(TDEListView *,TQListViewItem *item,const TQPoint&p)
{
if (!item) return;
int count = selectedItems().count();
@ -401,13 +401,13 @@ void KfindWindow::slotContextMenu(KListView *,TQListViewItem *item,const TQPoint
};
if (m_menu==0)
m_menu = new KPopupMenu(this);
m_menu = new TDEPopupMenu(this);
else
m_menu->clear();
if (count == 1)
{
//menu = new KPopupMenu(item->text(0), this);
//menu = new TDEPopupMenu(item->text(0), this);
m_menu->insertTitle(item->text(0));
m_menu->insertItem(SmallIcon("fileopen"),i18n("Menu item", "Open"), this, TQT_SLOT(openBinding()));
m_menu->insertItem(SmallIcon("window_new"),i18n("Open Folder"), this, TQT_SLOT(openFolder()));

8
kfind/kfwin.h
Unescape Escape View File

@ -14,7 +14,7 @@
class KfArchiver;
class TQPixmap;
class TQFileInfo;
class KPopupMenu;
class TDEPopupMenu;
class KfindWindow;
class KfFileLVI : public TQListViewItem
@ -29,7 +29,7 @@ class KfFileLVI : public TQListViewItem
KFileItem fileitem;
};
class KfindWindow: public KListView
class KfindWindow: public TDEListView
{
Q_OBJECT
public:
@ -44,7 +44,7 @@ public:
public slots:
void copySelection();
void slotContextMenu(KListView *,TQListViewItem *item,const TQPoint&p);
void slotContextMenu(TDEListView *,TQListViewItem *item,const TQPoint&p);
private slots:
void deleteFiles();
@ -66,7 +66,7 @@ signals:
private:
TQString m_baseDir;
KPopupMenu *m_menu;
TDEPopupMenu *m_menu;
bool haveSelection;
bool m_pressed;
void resetColumns(bool init);

10
khelpcenter/DESIGN
Unescape Escape View File

@ -129,7 +129,7 @@ KHC::ContentsTab object and a KHC::SearchTab object.
# This effectively enables people new to KDE in less time to become productive
# (a task-oriented list isn't so useful for peoplew ho are familiar with KDE's
# applications, of course).
# Implementation-wise, we should perhaps stop using a KListView and use a
# Implementation-wise, we should perhaps stop using a TDEListView and use a
# KOffice-style component selection widget like koshell has at the left?
The first five items are generated by KHC::Navigator itself and are direct
@ -138,14 +138,14 @@ items is (with one exception) delegated to four helper classes, which inherit a
'KHC::TreeBuilder' class which has the following interface:
class KHC::TreeBuilder
virtual void build( KListViewItem *parent ) = 0;
virtual void build( TDEListViewItem *parent ) = 0;
## What about the trees generated as children of the contents list view?
# Oops, that's a typo, what you mean is what I originally intented: a
# TreeBuilder should take a 'KListView' as it's parent, subclasses can then
# TreeBuilder should take a 'TDEListView' as it's parent, subclasses can then
# overload that method (such as the KHC::TOCBuilder which will want to provide
# a build( KListViewItem *parent ) method).
# a build( TDEListViewItem *parent ) method).
# This concept of using a TreeBuilder baseclass might make it possible to turn
# all the classes which use that interface into plugins. That way we could
@ -387,7 +387,7 @@ protocol == "help") by itself and otherwise use the plain URL.
# QObject::children() and iterate over all children, use QToolTip::textFor() to
# check whether the given qwidget has a tooltip and if so, use QToolTip::tip()
# to show the tooltip.
# One could probably add a standard dcop call to KMainWindow, like
# One could probably add a standard dcop call to TDEMainWindow, like
# "showAllToolTips". KSnapShot could get a QCheckBox "Show all tooltips", and
# if that box is checked it tells the selected window to show all it's
# tooltips via that DCOP call right before it does the snapshot. The thing is

12
khelpcenter/fontdialog.cpp
Unescape Escape View File

@ -87,37 +87,37 @@ void FontDialog::setupFontTypesBox()
TQLabel *lStandardFont = new TQLabel( i18n( "S&tandard font:" ), gb );
layout->addWidget( lStandardFont, 0, 0 );
m_standardFontCombo = new KFontCombo( gb );
m_standardFontCombo = new TDEFontCombo( gb );
layout->addWidget( m_standardFontCombo, 0, 1 );
lStandardFont->setBuddy( m_standardFontCombo );
TQLabel *lFixedFont = new TQLabel( i18n( "F&ixed font:" ), gb );
layout->addWidget( lFixedFont, 1, 0 );
m_fixedFontCombo = new KFontCombo( gb );
m_fixedFontCombo = new TDEFontCombo( gb );
layout->addWidget( m_fixedFontCombo, 1, 1 );
lFixedFont->setBuddy( m_fixedFontCombo );
TQLabel *lSerifFont = new TQLabel( i18n( "S&erif font:" ), gb );
layout->addWidget( lSerifFont, 2, 0 );
m_serifFontCombo = new KFontCombo( gb );
m_serifFontCombo = new TDEFontCombo( gb );
layout->addWidget( m_serifFontCombo, 2, 1 );
lSerifFont->setBuddy( m_serifFontCombo );
TQLabel *lSansSerifFont = new TQLabel( i18n( "S&ans serif font:" ), gb );
layout->addWidget( lSansSerifFont, 3, 0 );
m_sansSerifFontCombo = new KFontCombo( gb );
m_sansSerifFontCombo = new TDEFontCombo( gb );
layout->addWidget( m_sansSerifFontCombo, 3, 1 );
lSansSerifFont->setBuddy( m_sansSerifFontCombo );
TQLabel *lItalicFont = new TQLabel( i18n( "&Italic font:" ), gb );
layout->addWidget( lItalicFont, 4, 0 );
m_italicFontCombo = new KFontCombo( gb );
m_italicFontCombo = new TDEFontCombo( gb );
layout->addWidget( m_italicFontCombo, 4, 1 );
lItalicFont->setBuddy( m_italicFontCombo );
TQLabel *lFantasyFont = new TQLabel( i18n( "&Fantasy font:" ), gb );
layout->addWidget( lFantasyFont, 5, 0 );
m_fantasyFontCombo = new KFontCombo( gb );
m_fantasyFontCombo = new TDEFontCombo( gb );
layout->addWidget( m_fantasyFontCombo, 5, 1 );
lFantasyFont->setBuddy( m_fantasyFontCombo );
}

14
khelpcenter/fontdialog.h
Unescape Escape View File

@ -26,7 +26,7 @@ class TQBoxLayout;
class TQSpinBox;
class KComboBox;
class KFontCombo;
class TDEFontCombo;
class KIntNumInput;
namespace KHC {
@ -50,12 +50,12 @@ class FontDialog : public KDialogBase
KIntNumInput *m_minFontSize;
KIntNumInput *m_medFontSize;
KFontCombo *m_standardFontCombo;
KFontCombo *m_fixedFontCombo;
KFontCombo *m_serifFontCombo;
KFontCombo *m_sansSerifFontCombo;
KFontCombo *m_italicFontCombo;
KFontCombo *m_fantasyFontCombo;
TDEFontCombo *m_standardFontCombo;
TDEFontCombo *m_fixedFontCombo;
TDEFontCombo *m_serifFontCombo;
TDEFontCombo *m_sansSerifFontCombo;
TDEFontCombo *m_italicFontCombo;
TDEFontCombo *m_fantasyFontCombo;
KComboBox *m_defaultEncoding;
TQSpinBox *m_fontSizeAdjustement;
};

22
khelpcenter/glossary.cpp
Unescape Escape View File

@ -36,29 +36,29 @@
using namespace KHC;
class SectionItem : public KListViewItem
class SectionItem : public TDEListViewItem
{
public:
SectionItem( TQListViewItem *parent, const TQString &text )
: KListViewItem( parent, text )
: TDEListViewItem( parent, text )
{
setOpen( false );
}
virtual void setOpen( bool open )
{
KListViewItem::setOpen(open);
TDEListViewItem::setOpen(open);
setPixmap( 0, SmallIcon( TQString::fromLatin1( open ? "contents" : "contents2" ) ) );
}
};
class EntryItem : public KListViewItem
class EntryItem : public TDEListViewItem
{
public:
EntryItem( SectionItem *parent, const TQString &term, const TQString &id )
: KListViewItem( parent, term ),
: TDEListViewItem( parent, term ),
m_id( id )
{
}
@ -69,7 +69,7 @@ class EntryItem : public KListViewItem
TQString m_id;
};
Glossary::Glossary( TQWidget *parent ) : KListView( parent )
Glossary::Glossary( TQWidget *parent ) : TDEListView( parent )
{
m_initialized = false;
@ -84,10 +84,10 @@ Glossary::Glossary( TQWidget *parent ) : KListView( parent )
setAllColumnsShowFocus( true );
setRootIsDecorated( true );
m_byTopicItem = new KListViewItem( this, i18n( "By Topic" ) );
m_byTopicItem = new TDEListViewItem( this, i18n( "By Topic" ) );
m_byTopicItem->setPixmap( 0, SmallIcon( "help" ) );
m_alphabItem = new KListViewItem( this, i18n( "Alphabetically" ) );
m_alphabItem = new TDEListViewItem( this, i18n( "Alphabetically" ) );
m_alphabItem->setPixmap( 0, SmallIcon( "charset" ) );
m_cacheFile = locateLocal( "cache", "help/glossary.xml" );
@ -108,7 +108,7 @@ void Glossary::show()
buildGlossaryTree();
m_initialized = true;
}
KListView::show();
TDEListView::show();
}
Glossary::~Glossary()
@ -142,7 +142,7 @@ int Glossary::glossaryCTime() const
void Glossary::rebuildGlossaryCache()
{
KMainWindow *mainWindow = dynamic_cast<KMainWindow *>( kapp->mainWidget() );
TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( kapp->mainWidget() );
Q_ASSERT( mainWindow );
mainWindow->statusBar()->message( i18n( "Rebuilding cache..." ) );
@ -172,7 +172,7 @@ void Glossary::meinprocExited( TDEProcess *meinproc )
m_status = CacheOk;
KMainWindow *mainWindow = dynamic_cast<KMainWindow *>( kapp->mainWidget() );
TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( kapp->mainWidget() );
Q_ASSERT( mainWindow );
mainWindow->statusBar()->message( i18n( "Rebuilding cache... done." ), 2000 );

2
khelpcenter/glossary.h
Unescape Escape View File

@ -97,7 +97,7 @@ inline TQDataStream &operator>>( TQDataStream &stream, GlossaryEntry &e )
return stream >> e.m_term >> e.m_definition >> e.m_seeAlso;
}
class Glossary : public KListView
class Glossary : public TDEListView
{
Q_OBJECT
public:

12
khelpcenter/history.cpp
Unescape Escape View File

@ -51,11 +51,11 @@ History::~History()
{
}
void History::setupActions( KActionCollection *coll )
void History::setupActions( TDEActionCollection *coll )
{
TQPair<KGuiItem, KGuiItem> backForward = KStdGuiItem::backAndForward();
m_backAction = new KToolBarPopupAction( backForward.first, ALT+Key_Left,
m_backAction = new TDEToolBarPopupAction( backForward.first, ALT+Key_Left,
this, TQT_SLOT( back() ), coll, "back" );
connect( m_backAction->popupMenu(), TQT_SIGNAL( activated( int ) ),
TQT_SLOT( backActivated( int ) ) );
@ -63,7 +63,7 @@ void History::setupActions( KActionCollection *coll )
TQT_SLOT( fillBackMenu() ) );
m_backAction->setEnabled( false );
m_forwardAction = new KToolBarPopupAction( backForward.second, ALT+Key_Right,
m_forwardAction = new TDEToolBarPopupAction( backForward.second, ALT+Key_Right,
this, TQT_SLOT( forward() ), coll,
"forward" );
connect( m_forwardAction->popupMenu(), TQT_SIGNAL( activated( int ) ),
@ -73,7 +73,7 @@ void History::setupActions( KActionCollection *coll )
m_forwardAction->setEnabled( false );
}
void History::installMenuBarHook( KMainWindow *mainWindow )
void History::installMenuBarHook( TDEMainWindow *mainWindow )
{
TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>(
mainWindow->guiFactory()->container( "go_web", mainWindow ) );
@ -256,7 +256,7 @@ void History::fillForwardMenu()
void History::fillGoMenu()
{
KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() );
TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( kapp->mainWidget() );
TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
if ( !goMenu || m_goMenuIndex == -1 )
return;
@ -289,7 +289,7 @@ void History::fillGoMenu()
void History::goMenuActivated( int id )
{
KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() );
TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( kapp->mainWidget() );
TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
if ( !goMenu )
return;

14
khelpcenter/history.h
Unescape Escape View File

@ -25,9 +25,9 @@
#include <tqobject.h>
#include <tqptrlist.h>
class KActionCollection;
class KMainWindow;
class KToolBarPopupAction;
class TDEActionCollection;
class TDEMainWindow;
class TDEToolBarPopupAction;
class TQPopupMenu;
namespace KHC {
@ -52,10 +52,10 @@ class History : public TQObject
static History &self();
void setupActions( KActionCollection *coll );
void setupActions( TDEActionCollection *coll );
void updateActions();
void installMenuBarHook( KMainWindow *mainWindow );
void installMenuBarHook( TDEMainWindow *mainWindow );
void createEntry();
void updateCurrentEntry( KHC::View *view );
@ -97,8 +97,8 @@ class History : public TQObject
int m_goMenuHistoryStartPos;
int m_goMenuHistoryCurrentPos;
public:
KToolBarPopupAction *m_backAction;
KToolBarPopupAction *m_forwardAction;
TDEToolBarPopupAction *m_backAction;
TDEToolBarPopupAction *m_forwardAction;
};
}

2
khelpcenter/htmlsearch/kcmhtmlsearch.cpp
Unescape Escape View File

@ -135,7 +135,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
delButton = new TQPushButton(i18n("Delete"), gb);
grid->addWidget(delButton, 2,0);
searchPaths = new KListBox(gb);
searchPaths = new TDEListBox(gb);
grid->addMultiCellWidget(searchPaths, 1,3, 1,1);
grid->setRowStretch(2,2);

4
khelpcenter/htmlsearch/kcmhtmlsearch.h
Unescape Escape View File

@ -28,7 +28,7 @@
class TQLineEdit;
class TQCheckBox;
class TQPushButton;
class KListBox;
class TDEListBox;
class TDEProcess;
class KLanguageCombo;
class KURLRequester;
@ -71,7 +71,7 @@ private:
KURLRequester *htdigBin, *htsearchBin, *htmergeBin;
TQCheckBox *indexKDE, *indexMan, *indexInfo;
TQPushButton *addButton, *delButton, *runButton;
KListBox *searchPaths;
TDEListBox *searchPaths;
KLanguageCombo *language;
TDEProcess *indexProc;

2
khelpcenter/kcmhelpcenter.cpp
Unescape Escape View File

@ -273,7 +273,7 @@ void KCMHelpCenter::setupMainWidget( TQWidget *parent )
TQLabel *label = new TQLabel( helpText, parent );
topLayout->addWidget( label );
mListView = new KListView( parent );
mListView = new TDEListView( parent );
mListView->setFullWidth( true );
mListView->addColumn( i18n("Search Scope") );
mListView->addColumn( i18n("Status") );

4
khelpcenter/kcmhelpcenter.h
Unescape Escape View File

@ -37,7 +37,7 @@ class TDEConfig;
class TDEAboutData;
class KTempFile;
class KURLRequester;
class KListView;
class TDEListView;
namespace KHC {
class HtmlSearchConfig;
@ -154,7 +154,7 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
private:
KHC::SearchEngine *mEngine;
KListView *mListView;
TDEListView *mListView;
TQLabel *mIndexDirLabel;
TQPushButton *mBuildButton;
IndexProgressDialog *mProgressDialog;

20
khelpcenter/mainwindow.cpp
Unescape Escape View File

@ -85,7 +85,7 @@ class LogDialog : public KDialogBase
MainWindow::MainWindow()
: KMainWindow(0, "MainWindow"), DCOPObject( "KHelpCenterIface" ),
: TDEMainWindow(0, "MainWindow"), DCOPObject( "KHelpCenterIface" ),
mLogDialog( 0 )
{
mSplitter = new TQSplitter( this );
@ -212,27 +212,27 @@ void MainWindow::setupActions()
KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection(),
"printFrame" );
KAction *prevPage = new KAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQT_SLOT( prevPage() ),
TDEAction *prevPage = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQT_SLOT( prevPage() ),
actionCollection(), "prevPage" );
prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) );
KAction *nextPage = new KAction( i18n( "Next Page" ), CTRL + Key_PageDown, mDoc, TQT_SLOT( nextPage() ),
TDEAction *nextPage = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, mDoc, TQT_SLOT( nextPage() ),
actionCollection(), "nextPage" );
nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) );
KAction *home = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( slotShowHome() ), actionCollection() );
TDEAction *home = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( slotShowHome() ), actionCollection() );
home->setText(i18n("Table of &Contents"));
home->setToolTip(i18n("Table of contents"));
home->setWhatsThis(i18n("Go back to the table of contents"));
mCopyText = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelectedText()), actionCollection(), "copy_text");
mLastSearchAction = new KAction( i18n("&Last Search Result"), 0, TQT_TQOBJECT(this),
mLastSearchAction = new TDEAction( i18n("&Last Search Result"), 0, TQT_TQOBJECT(this),
TQT_SLOT( slotLastSearch() ),
actionCollection(), "lastsearch" );
mLastSearchAction->setEnabled( false );
new KAction( i18n("Build Search Index..."), 0, TQT_TQOBJECT(mNavigator),
new TDEAction( i18n("Build Search Index..."), 0, TQT_TQOBJECT(mNavigator),
TQT_SLOT( showIndexDialog() ), actionCollection(), "build_index" );
KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ),
actionCollection() );
@ -240,16 +240,16 @@ void MainWindow::setupActions()
TDEConfig *cfg = TDEGlobal::config();
cfg->setGroup( "Debug" );
if ( cfg->readBoolEntry( "SearchErrorLog", false ) ) {
new KAction( i18n("Show Search Error Log"), 0, TQT_TQOBJECT(this),
new TDEAction( i18n("Show Search Error Log"), 0, TQT_TQOBJECT(this),
TQT_SLOT( showSearchStderr() ), actionCollection(),
"show_search_stderr" );
}
History::self().setupActions( actionCollection() );
new KAction( i18n( "Configure Fonts..." ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" );
new KAction( i18n( "Increase Font Sizes" ), "viewmag+", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" );
new KAction( i18n( "Decrease Font Sizes" ), "viewmag-", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" );
new TDEAction( i18n( "Configure Fonts..." ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" );
new TDEAction( i18n( "Increase Font Sizes" ), "viewmag+", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" );
new TDEAction( i18n( "Decrease Font Sizes" ), "viewmag-", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" );
}
void MainWindow::slotCopySelectedText()

6
khelpcenter/mainwindow.h
Unescape Escape View File

@ -22,7 +22,7 @@ namespace KHC {
class View;
class MainWindow : public KMainWindow, public DCOPObject
class MainWindow : public TDEMainWindow, public DCOPObject
{
Q_OBJECT
K_DCOP
@ -97,8 +97,8 @@ private:
View *mDoc;
Navigator *mNavigator;
KAction *mLastSearchAction;
KAction *mCopyText;
TDEAction *mLastSearchAction;
TDEAction *mCopyText;
LogDialog *mLogDialog;
};

2
khelpcenter/navigator.cpp
Unescape Escape View File

@ -160,7 +160,7 @@ bool Navigator::showMissingDocs() const
void Navigator::setupContentsTab()
{
mContentsTree = new KListView( mTabWidget );
mContentsTree = new TDEListView( mTabWidget );
mContentsTree->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
mContentsTree->addColumn(TQString::null);
mContentsTree->setAllColumnsShowFocus(true);

4
khelpcenter/navigator.h
Unescape Escape View File

@ -36,7 +36,7 @@
class TQPushButton;
class KListView;
class TDEListView;
class KService;
class TDEProcess;
class KProcIO;
@ -118,7 +118,7 @@ class Navigator : public TQWidget
void insertPlugins();
void hideSearch();
KListView *mContentsTree;
TDEListView *mContentsTree;
Glossary *mGlossaryTree;
SearchWidget *mSearchWidget;

6
khelpcenter/view.cpp
Unescape Escape View File

@ -21,7 +21,7 @@
using namespace KHC;
View::View( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof, KActionCollection *col )
TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof, TDEActionCollection *col )
: TDEHTMLPart( parentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col)
{
setJScriptEnabled(false);
@ -246,10 +246,10 @@ void View::slotDecFontSizes()
void View::showMenu( const TQString& url, const TQPoint& pos)
{
KPopupMenu* pop = new KPopupMenu(view());
TDEPopupMenu* pop = new TDEPopupMenu(view());
if (url.isEmpty())
{
KAction *action;
TDEAction *action;
action = mActionCollection->action("go_home");
if (action) action->plug(pop);

6
khelpcenter/view.h
Unescape Escape View File

@ -6,7 +6,7 @@
#include "glossary.h"
#include "navigator.h"
class KActionCollection;
class TDEActionCollection;
namespace DOM {
class Node;
@ -22,7 +22,7 @@ class View : public TDEHTMLPart
public:
View( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof,
KActionCollection *col );
TDEActionCollection *col );
~View();
@ -83,7 +83,7 @@ class View : public TDEHTMLPart
int m_zoomStepping;
Formatter *mFormatter;
KActionCollection *mActionCollection;
TDEActionCollection *mActionCollection;
TQString mCopyURL;
};

2
khotkeys/TODO
Unescape Escape View File

@ -73,7 +73,7 @@ akce : kdyz se objevi okno, aplikovat na nej veci, ktere dela kstart ( sticky, a
strokes : kdyz X bere mys pres gpmdata, gpm pekne zasekava u vstupu pri prostrednim tlacitku dole => strokes pak za moc nestoji
paste pri MMB volitelne jen kdyz MMB neni stisknuto napr. pres 500ms ( kvuli strokes )
akce : kdyz se stiskne nejaka shortcut a nejaka aplikace nebezi, tak se spusti a pak se ji ta shortcut preda ( napr. pro klipper ? )
odstranit tu KAccel zmenu, kterou v CVS udelal Coolo - stejne netusim, jestli to ma nebo nema byt i18n, tak at je aspon default
odstranit tu TDEAccel zmenu, kterou v CVS udelal Coolo - stejne netusim, jestli to ma nebo nema byt i18n, tak at je aspon default
skupine akci 'KMenuedit entries' by asi nemelo jit zmenit jmeno
kdyz se v KMenuEdit udela polozka a pak se ten menuentry smaze, asi by se ta shortcut mela aspon disablovat ?!
at dokaze zvetsovat vsechna 'File Open Dialog' okna

8
khotkeys/kcontrol/kcmkhotkeys.h
Unescape Escape View File

@ -54,8 +54,8 @@ class Module
void set_daemon_disabled( bool disable );
bool daemon_disabled() const;
void import();
KShortcut voice_shortcut() const;
void set_voice_shortcut( const KShortcut&) ;
TDEShortcut voice_shortcut() const;
void set_voice_shortcut( const TDEShortcut&) ;
public slots:
void changed();
protected:
@ -153,13 +153,13 @@ bool Module::daemon_disabled() const
inline
void Module::set_voice_shortcut( const KShortcut& cut)
void Module::set_voice_shortcut( const TDEShortcut& cut)
{
settings.voice_shortcut=cut;
}
inline
KShortcut Module::voice_shortcut() const
TDEShortcut Module::voice_shortcut() const
{
return settings.voice_shortcut;
}

4
khotkeys/kcontrol/menuedit.cpp
Unescape Escape View File

@ -288,9 +288,9 @@ TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
}
TQString shortcut = "";
// make sure the shortcut is valid
shortcut = (KShortcut( shortcut_P )).toStringInternal();
shortcut = (TDEShortcut( shortcut_P )).toStringInternal();
if( !shortcut.isEmpty())
entry->set_trigger( new Shortcut_trigger( entry, KShortcut( shortcut )));
entry->set_trigger( new Shortcut_trigger( entry, TDEShortcut( shortcut )));
if( shortcut.isEmpty())
{
delete entry;

10
khotkeys/kcontrol/triggers_tab.cpp
Unescape Escape View File

@ -125,7 +125,7 @@ void Triggers_tab::new_selected( int type_P )
{
case TYPE_SHORTCUT_TRIGGER: // Shortcut_trigger
dlg = new Shortcut_trigger_dialog(
new Shortcut_trigger( NULL, KShortcut())); // CHECKME NULL ?
new Shortcut_trigger( NULL, TDEShortcut())); // CHECKME NULL ?
break;
case TYPE_GESTURE_TRIGGER: // Gesture trigger
dlg = new Gesture_trigger_dialog(
@ -230,16 +230,16 @@ Shortcut_trigger_widget::Shortcut_trigger_widget( TQWidget* parent_P, const char
lay->addWidget( bt, 0 , Qt::AlignHCenter );
lay->addStretch();
clear_data();
connect( bt, TQT_SIGNAL( capturedShortcut( const KShortcut& )),
this, TQT_SLOT( capturedShortcut( const KShortcut& )));
connect( bt, TQT_SIGNAL( capturedShortcut( const TDEShortcut& )),
this, TQT_SLOT( capturedShortcut( const TDEShortcut& )));
}
void Shortcut_trigger_widget::clear_data()
{
bt->setShortcut( KShortcut(), false );
bt->setShortcut( TDEShortcut(), false );
}
void Shortcut_trigger_widget::capturedShortcut( const KShortcut& s_P )
void Shortcut_trigger_widget::capturedShortcut( const TDEShortcut& s_P )
{
if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, topLevelWidget())
|| KKeyChooser::checkStandardShortcutsConflict( s_P, true, topLevelWidget()))

4
khotkeys/kcontrol/triggers_tab.h
Unescape Escape View File

@ -20,7 +20,7 @@
#include <window_trigger_widget.h>
class KKeyButton;
class KShortcut;
class TDEShortcut;
namespace KHotKeys
{
@ -90,7 +90,7 @@ class Shortcut_trigger_widget
public slots:
void clear_data();
private slots:
void capturedShortcut( const KShortcut& );
void capturedShortcut( const TDEShortcut& );
private:
KKeyButton* bt;
};

6
khotkeys/kcontrol/voice_settings_tab.cpp
Unescape Escape View File

@ -26,7 +26,7 @@ namespace KHotKeys
Voice_settings_tab::Voice_settings_tab( TQWidget* parent_P, const char* name_P )
: Voice_settings_tab_ui( parent_P, name_P )
{
connect( keyButton , TQT_SIGNAL(capturedShortcut (const KShortcut &)) , this, TQT_SLOT(slotCapturedKey( const KShortcut& )));
connect( keyButton , TQT_SIGNAL(capturedShortcut (const TDEShortcut &)) , this, TQT_SLOT(slotCapturedKey( const TDEShortcut& )));
}
void Voice_settings_tab::read_data()
@ -44,9 +44,9 @@ void Voice_settings_tab::clear_data()
// "global" tab, not action specific, do nothing
}
void Voice_settings_tab::slotCapturedKey( const KShortcut& cut)
void Voice_settings_tab::slotCapturedKey( const TDEShortcut& cut)
{
/*for(uint seq=0; seq<KShortcut::MAX_SEQUENCES; seq++)
/*for(uint seq=0; seq<TDEShortcut::MAX_SEQUENCES; seq++)
{
KKeySequance key=cut.seq(seq);
if(key.isNull())

4
khotkeys/kcontrol/voice_settings_tab.h
Unescape Escape View File

@ -13,7 +13,7 @@
#include <voice_settings_tab_ui.h>
class KShortcut;
class TDEShortcut;
namespace KHotKeys
{
@ -29,7 +29,7 @@ class Voice_settings_tab
public slots:
void clear_data();
private slots:
void slotCapturedKey( const KShortcut& );
void slotCapturedKey( const TDEShortcut& );
};
//***************************************************************************

4
khotkeys/shared/action_data.cpp
Unescape Escape View File

@ -287,7 +287,7 @@ void Generic_action_data::cfg_write( TDEConfig& cfg_P ) const
Command_url_shortcut_action_data::Command_url_shortcut_action_data( Action_data_group* parent_P,
const TQString& name_P, const TQString& comment_P,
const KShortcut& shortcut_P, const TQString& command_url_P, bool enabled_P )
const TDEShortcut& shortcut_P, const TQString& command_url_P, bool enabled_P )
: Simple_action_data< Shortcut_trigger, Command_url_action >( parent_P, name_P,
comment_P, enabled_P )
{
@ -307,7 +307,7 @@ void Simple_action_data< Shortcut_trigger, Command_url_action >
Menuentry_shortcut_action_data::Menuentry_shortcut_action_data( Action_data_group* parent_P,
const TQString& name_P, const TQString& comment_P,
const KShortcut& shortcut_P, const TQString& menuentry_P, bool enabled_P )
const TDEShortcut& shortcut_P, const TQString& menuentry_P, bool enabled_P )
: Simple_action_data< Shortcut_trigger, Menuentry_action >( parent_P, name_P,
comment_P, enabled_P )
{

4
khotkeys/shared/action_data.h
Unescape Escape View File

@ -165,7 +165,7 @@ class KDE_EXPORT Command_url_shortcut_action_data
Command_url_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P,
const TQString& comment_P, bool enabled_P = true );
Command_url_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P,
const TQString& comment_P, const KShortcut& shortcut_P, const TQString& command_url_P,
const TQString& comment_P, const TDEShortcut& shortcut_P, const TQString& command_url_P,
bool enabled_P = true );
Command_url_shortcut_action_data( TDEConfig& cfg_P, Action_data_group* parent_P );
};
@ -178,7 +178,7 @@ class KDE_EXPORT Menuentry_shortcut_action_data
Menuentry_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P,
const TQString& comment_P, bool enabled_P = true );
Menuentry_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P,
const TQString& comment_P, const KShortcut& shortcut_P, const TQString& command_url_P,
const TQString& comment_P, const TDEShortcut& shortcut_P, const TQString& command_url_P,
bool enabled_P = true );
Menuentry_shortcut_action_data( TDEConfig& cfg_P, Action_data_group* parent_P );
};

14
khotkeys/shared/input.cpp
Unescape Escape View File

@ -53,7 +53,7 @@ Kbd::~Kbd()
delete kga;
}
void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P )
void Kbd::insert_item( const TDEShortcut& shortcut_P, Kbd_receiver* receiver_P )
{
Receiver_data& rcv = receivers[ receiver_P ];
rcv.shortcuts.append( shortcut_P );
@ -61,7 +61,7 @@ void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P )
grab_shortcut( shortcut_P );
}
void Kbd::remove_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P )
void Kbd::remove_item( const TDEShortcut& shortcut_P, Kbd_receiver* receiver_P )
{
Receiver_data& rcv = receivers[ receiver_P ];
rcv.shortcuts.remove( shortcut_P );
@ -77,7 +77,7 @@ void Kbd::activate_receiver( Kbd_receiver* receiver_P )
if( rcv.active )
return;
rcv.active = true;
for( TQValueList< KShortcut >::ConstIterator it( rcv.shortcuts.begin());
for( TQValueList< TDEShortcut >::ConstIterator it( rcv.shortcuts.begin());
it != rcv.shortcuts.end();
++it )
grab_shortcut( *it );
@ -89,13 +89,13 @@ void Kbd::deactivate_receiver( Kbd_receiver* receiver_P )
if( !rcv.active )
return;
rcv.active = false;
for( TQValueList< KShortcut >::ConstIterator it( rcv.shortcuts.begin());
for( TQValueList< TDEShortcut >::ConstIterator it( rcv.shortcuts.begin());
it != rcv.shortcuts.end();
++it )
ungrab_shortcut( *it );
}
void Kbd::grab_shortcut( const KShortcut& shortcut_P )
void Kbd::grab_shortcut( const TDEShortcut& shortcut_P )
{
if( grabs.contains( shortcut_P ))
++grabs[ shortcut_P ];
@ -115,7 +115,7 @@ void Kbd::grab_shortcut( const KShortcut& shortcut_P )
}
}
void Kbd::ungrab_shortcut( const KShortcut& shortcut_P )
void Kbd::ungrab_shortcut( const TDEShortcut& shortcut_P )
{
if( !grabs.contains( shortcut_P ))
return;
@ -141,7 +141,7 @@ void Kbd::update_connections()
void Kbd::key_slot( TQString key_P )
{
kdDebug( 1217 ) << "Key pressed:" << key_P << endl;
KShortcut shortcut( key_P );
TDEShortcut shortcut( key_P );
if( !grabs.contains( shortcut ))
return;
for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = receivers.begin();

14
khotkeys/shared/input.h
Unescape Escape View File

@ -29,7 +29,7 @@ namespace KHotKeys
class Kbd_receiver
{
public:
virtual bool handle_key( const KShortcut& shortcut_P ) = 0;
virtual bool handle_key( const TDEShortcut& shortcut_P ) = 0;
};
class Kbd
@ -39,15 +39,15 @@ class Kbd
public:
Kbd( bool grabbing_enabled_P, TQObject* parent_P );
virtual ~Kbd();
void insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P );
void remove_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P );
void insert_item( const TDEShortcut& shortcut_P, Kbd_receiver* receiver_P );
void remove_item( const TDEShortcut& shortcut_P, Kbd_receiver* receiver_P );
void activate_receiver( Kbd_receiver* receiver_P );
void deactivate_receiver( Kbd_receiver* receiver_P );
static bool send_macro_key( const KKey& key, Window window_P = InputFocus );
protected:
bool x11EventFilter( const XEvent* );
void grab_shortcut( const KShortcut& shortcut_P );
void ungrab_shortcut( const KShortcut& shortcut_P );
void grab_shortcut( const TDEShortcut& shortcut_P );
void ungrab_shortcut( const TDEShortcut& shortcut_P );
private slots:
void key_slot( TQString key_P );
void update_connections();
@ -55,11 +55,11 @@ class Kbd
struct Receiver_data
{
Receiver_data();
TQValueList< KShortcut > shortcuts;
TQValueList< TDEShortcut > shortcuts;
bool active;
};
TQMap< Kbd_receiver*, Receiver_data > receivers;
TQMap< KShortcut, int > grabs;
TQMap< TDEShortcut, int > grabs;
TDEGlobalAccel* kga;
};

10
khotkeys/shared/khlistview.cpp
Unescape Escape View File

@ -22,7 +22,7 @@ namespace KHotKeys
{
KHListView::KHListView( TQWidget* parent_P, const char* name_P )
: KListView( parent_P, name_P ), saved_current_item( NULL ),
: TDEListView( parent_P, name_P ), saved_current_item( NULL ),
in_clear( false ), ignore( false ), force_select( false )
{
connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem* )),
@ -72,7 +72,7 @@ void KHListView::slot_current_changed( TQListViewItem* item_P )
void KHListView::clear()
{
in_clear = true;
KListView::clear();
TDEListView::clear();
in_clear = false;
slot_selection_changed( NULL );
}
@ -82,7 +82,7 @@ void KHListView::insertItem( TQListViewItem* item_P )
bool set = false;
if( !in_clear )
set = childCount() == 0;
KListView::insertItem( item_P );
TDEListView::insertItem( item_P );
if( set && force_select )
{
bool block = signalsBlocked();
@ -96,7 +96,7 @@ void KHListView::insertItem( TQListViewItem* item_P )
void KHListView::clearSelection()
{
KListView::clearSelection();
TDEListView::clearSelection();
slot_current_changed( currentItem());
}
@ -113,7 +113,7 @@ void KHListView::contentsDropEvent( TQDropEvent* e )
{
bool save_ignore = ignore;
ignore = true;
KListView::contentsDropEvent( e );
TDEListView::contentsDropEvent( e );
ignore = save_ignore;
}

2
khotkeys/shared/khlistview.h
Unescape Escape View File

@ -20,7 +20,7 @@ namespace KHotKeys
{
class KDE_EXPORT KHListView
: public KListView
: public TDEListView
{
Q_OBJECT
TQ_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect )

6
khotkeys/shared/settings.cpp
Unescape Escape View File

@ -114,7 +114,7 @@ bool Settings::read_settings( TDEConfig& cfg_P, bool include_disabled_P, ImportT
delete gestures_exclude;
gestures_exclude = new Windowdef_list( cfg_P );
cfg_P.setGroup( "Voice" );
voice_shortcut=KShortcut( cfg_P.readEntry("Shortcut" , "") );
voice_shortcut=TDEShortcut( cfg_P.readEntry("Shortcut" , "") );
return true;
}
@ -252,12 +252,12 @@ void Settings::read_settings_v1( TDEConfig& cfg_P )
menuentries->set_conditions( new Condition_list( "", menuentries ));
}
( void ) new Menuentry_shortcut_action_data( menuentries, name, "",
KShortcut( shortcut ), run );
TDEShortcut( shortcut ), run );
}
else