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

Rename a number of classes to enhance compatibility with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 53904b41cf
commit 9e5c87c895
117 changed files with 703 additions and 703 deletions
Show Stats Download Patch File Download Diff File

2
ark/ChangeLog
Unescape View File

@ -112,7 +112,7 @@
to extract a symlink??) to extract a symlink??)
2000-04-06: Emily Ezust <emilye@corel.com> 2000-04-06: Emily Ezust <emilye@corel.com>
* Switched to KListView * Switched to TDEListView
* Some work on settings and archive-specific actions * Some work on settings and archive-specific actions
* Couldn't load LHA archives with files that were symlinks; fixed * Couldn't load LHA archives with files that were symlinks; fixed
* Added more entries to the Settings and RMB menu. Toggle menu bar will * Added more entries to the Settings and RMB menu. Toggle menu bar will

26
ark/ark_part.cpp
Unescape View File

@ -116,47 +116,47 @@ ArkPart::~ArkPart()
void void
ArkPart::setupActions() ArkPart::setupActions()
{ {
addFileAction = new KAction(i18n("Add &File..."), "ark_addfile", 0, TQT_TQOBJECT(awidget), addFileAction = new TDEAction(i18n("Add &File..."), "ark_addfile", 0, TQT_TQOBJECT(awidget),
TQT_SLOT(action_add()), actionCollection(), "addfile"); TQT_SLOT(action_add()), actionCollection(), "addfile");
addDirAction = new KAction(i18n("Add Folde&r..."), "ark_adddir", 0, TQT_TQOBJECT(awidget), addDirAction = new TDEAction(i18n("Add Folde&r..."), "ark_adddir", 0, TQT_TQOBJECT(awidget),
TQT_SLOT(action_add_dir()), actionCollection(), "adddir"); TQT_SLOT(action_add_dir()), actionCollection(), "adddir");
extractAction = new KAction(i18n("E&xtract..."), "ark_extract", 0, TQT_TQOBJECT(awidget), extractAction = new TDEAction(i18n("E&xtract..."), "ark_extract", 0, TQT_TQOBJECT(awidget),
TQT_SLOT(action_extract()), actionCollection(), "extract"); TQT_SLOT(action_extract()), actionCollection(), "extract");
deleteAction = new KAction(i18n("De&lete"), "ark_delete", KShortcut(TQt::Key_Delete), TQT_TQOBJECT(awidget), deleteAction = new TDEAction(i18n("De&lete"), "ark_delete", TDEShortcut(TQt::Key_Delete), TQT_TQOBJECT(awidget),
TQT_SLOT(action_delete()), actionCollection(), "delete"); TQT_SLOT(action_delete()), actionCollection(), "delete");
viewAction = new KAction(i18n("to view something","&View"), "ark_view", 0, TQT_TQOBJECT(awidget), viewAction = new TDEAction(i18n("to view something","&View"), "ark_view", 0, TQT_TQOBJECT(awidget),
TQT_SLOT(action_view()), actionCollection(), "view"); TQT_SLOT(action_view()), actionCollection(), "view");
openWithAction = new KAction(i18n("&Open With..."), 0, TQT_TQOBJECT(awidget), openWithAction = new TDEAction(i18n("&Open With..."), 0, TQT_TQOBJECT(awidget),
TQT_SLOT(slotOpenWith()), actionCollection(), "open_with"); TQT_SLOT(slotOpenWith()), actionCollection(), "open_with");
editAction = new KAction(i18n("Edit &With..."), 0, TQT_TQOBJECT(awidget), editAction = new TDEAction(i18n("Edit &With..."), 0, TQT_TQOBJECT(awidget),
TQT_SLOT(action_edit()), actionCollection(), "edit"); TQT_SLOT(action_edit()), actionCollection(), "edit");
testAction = new KAction(i18n("&Test integrity"), 0, awidget, testAction = new TDEAction(i18n("&Test integrity"), 0, awidget,
TQT_SLOT(action_test()), actionCollection(), "test"); TQT_SLOT(action_test()), actionCollection(), "test");
selectAllAction = KStdAction::selectAll(TQT_TQOBJECT(awidget->fileList()), TQT_SLOT(selectAll()), actionCollection(), "select_all"); selectAllAction = KStdAction::selectAll(TQT_TQOBJECT(awidget->fileList()), TQT_SLOT(selectAll()), actionCollection(), "select_all");
deselectAllAction = new KAction(i18n("&Unselect All"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(unselectAll()), actionCollection(), "deselect_all"); deselectAllAction = new TDEAction(i18n("&Unselect All"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(unselectAll()), actionCollection(), "deselect_all");
invertSelectionAction = new KAction(i18n("&Invert Selection"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(invertSelection()), actionCollection(), "invert_selection"); invertSelectionAction = new TDEAction(i18n("&Invert Selection"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(invertSelection()), actionCollection(), "invert_selection");
saveAsAction = KStdAction::saveAs(this, TQT_SLOT(file_save_as()), actionCollection()); saveAsAction = KStdAction::saveAs(this, TQT_SLOT(file_save_as()), actionCollection());
//KStdAction::preferences(awidget, TQT_SLOT(showSettings()), actionCollection()); //KStdAction::preferences(awidget, TQT_SLOT(showSettings()), actionCollection());
( void ) new KAction( i18n( "Configure &Ark..." ), "configure" , 0, TQT_TQOBJECT(awidget), ( void ) new TDEAction( i18n( "Configure &Ark..." ), "configure" , 0, TQT_TQOBJECT(awidget),
TQT_SLOT( showSettings() ), actionCollection(), "options_configure_ark" ); TQT_SLOT( showSettings() ), actionCollection(), "options_configure_ark" );
showSearchBar = new KToggleAction( i18n( "Show Search Bar" ), KShortcut(), actionCollection(), "options_show_search_bar" ); showSearchBar = new TDEToggleAction( i18n( "Show Search Bar" ), TDEShortcut(), actionCollection(), "options_show_search_bar" );
showSearchBar->setCheckedState(i18n("Hide Search Bar")); showSearchBar->setCheckedState(i18n("Hide Search Bar"));
showSearchBar->setChecked( ArkSettings::showSearchBar() ); showSearchBar->setChecked( ArkSettings::showSearchBar() );
@ -319,7 +319,7 @@ bool ArkPart::closeURL()
void ArkPart::slotFilePopup( const TQPoint &pPoint ) void ArkPart::slotFilePopup( const TQPoint &pPoint )
{ {
if ( factory() ) if ( factory() )
static_cast<KPopupMenu *>(factory()->container("file_popup", this))->popup(pPoint); static_cast<TDEPopupMenu *>(factory()->container("file_popup", this))->popup(pPoint);
} }
void ArkPart::transferStarted( TDEIO::Job *job ) void ArkPart::transferStarted( TDEIO::Job *job )

36
ark/ark_part.h
Unescape View File

@ -127,24 +127,24 @@ private:
ArkBrowserExtension *m_ext; ArkBrowserExtension *m_ext;
ArkStatusBarExtension *m_bar; ArkStatusBarExtension *m_bar;
KAction *saveAsAction; TDEAction *saveAsAction;
KAction *addFileAction; TDEAction *addFileAction;
KAction *addDirAction; TDEAction *addDirAction;
KAction *extractAction; TDEAction *extractAction;
KAction *deleteAction; TDEAction *deleteAction;
KAction *selectAllAction; TDEAction *selectAllAction;
KAction *viewAction; TDEAction *viewAction;
KAction *helpAction; TDEAction *helpAction;
KAction *openWithAction; TDEAction *openWithAction;
KAction *deselectAllAction; TDEAction *deselectAllAction;
KAction *invertSelectionAction; TDEAction *invertSelectionAction;
KAction *editAction; TDEAction *editAction;
KAction *testAction; TDEAction *testAction;
// the following have different enable rules from the above KActions // the following have different enable rules from the above TDEActions
KAction *popupViewAction; TDEAction *popupViewAction;
KAction *popupOpenWithAction; TDEAction *popupOpenWithAction;
KToggleAction *showSearchBar; TDEToggleAction *showSearchBar;
TDEIO::Job *m_job; TDEIO::Job *m_job;
}; };

2
ark/arkwidget.cpp
Unescape View File

@ -127,7 +127,7 @@ ArkWidget::ArkWidget( TQWidget *parent, const char *name )
m_tmpDir = NULL; m_tmpDir = NULL;
} }
m_searchToolBar = new KToolBar( this, "searchBar" ); m_searchToolBar = new TDEToolBar( this, "searchBar" );
m_searchToolBar->boxLayout()->setSpacing( KDialog::spacingHint() ); m_searchToolBar->boxLayout()->setSpacing( KDialog::spacingHint() );
TQLabel * l1 = new TQLabel( i18n( "&Search:" ), m_searchToolBar, "kde toolbar widget" ); TQLabel * l1 = new TQLabel( i18n( "&Search:" ), m_searchToolBar, "kde toolbar widget" );

6
ark/arkwidget.h
Unescape View File

@ -44,13 +44,13 @@ class TQListViewItem;
class TQDragMoveEvent; class TQDragMoveEvent;
class TQDropEvent; class TQDropEvent;
class KPopupMenu; class TDEPopupMenu;
class TDEProcess; class TDEProcess;
class KURL; class KURL;
class KRun; class KRun;
class KTempFile; class KTempFile;
class KTempDir; class KTempDir;
class KToolBar; class TDEToolBar;
class FileListView; class FileListView;
class SearchBar; class SearchBar;
@ -292,7 +292,7 @@ private: // data
bool m_modified; bool m_modified;
KToolBar * m_searchToolBar; TDEToolBar * m_searchToolBar;
SearchBar * m_searchBar; SearchBar * m_searchBar;
Arch * arch; Arch * arch;

30
ark/filelistview.cpp
Unescape View File

@ -45,15 +45,15 @@
// FileLVI implementation // FileLVI implementation
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
FileLVI::FileLVI( KListView* lv ) FileLVI::FileLVI( TDEListView* lv )
: KListViewItem( lv ), m_fileSize( 0 ), m_packedFileSize( 0 ), : TDEListViewItem( lv ), m_fileSize( 0 ), m_packedFileSize( 0 ),
m_ratio( 0 ), m_timeStamp( TQDateTime() ), m_entryName( TQString() ) m_ratio( 0 ), m_timeStamp( TQDateTime() ), m_entryName( TQString() )
{ {
} }
FileLVI::FileLVI( KListViewItem* lvi ) FileLVI::FileLVI( TDEListViewItem* lvi )
: KListViewItem( lvi ), m_fileSize( 0 ), m_packedFileSize( 0 ), : TDEListViewItem( lvi ), m_fileSize( 0 ), m_packedFileSize( 0 ),
m_ratio( 0 ), m_timeStamp( TQDateTime() ), m_entryName( TQString() ) m_ratio( 0 ), m_timeStamp( TQDateTime() ), m_entryName( TQString() )
{ {
} }
@ -77,7 +77,7 @@ int FileLVI::compare( TQListViewItem * i, int column, bool ascending ) const
return 1; return 1;
if ( column == 0 ) if ( column == 0 )
return KListViewItem::compare( i, column, ascending ); return TDEListViewItem::compare( i, column, ascending );
columnName colName = ( static_cast< FileListView * > ( listView() ) )->nameOfColumn( column ); columnName colName = ( static_cast< FileListView * > ( listView() ) )->nameOfColumn( column );
switch ( colName ) switch ( colName )
@ -115,7 +115,7 @@ int FileLVI::compare( TQListViewItem * i, int column, bool ascending ) const
} }
default: default:
return KListViewItem::compare( i, column, ascending ); return TDEListViewItem::compare( i, column, ascending );
} }
} }
@ -170,7 +170,7 @@ void FileLVI::setText( int column, const TQString &text )
TQListViewItem::setText(column, text); TQListViewItem::setText(column, text);
} }
static FileLVI* folderLVI( KListViewItem *parent, const TQString& name ) static FileLVI* folderLVI( TDEListViewItem *parent, const TQString& name )
{ {
FileLVI *folder = new FileLVI( parent ); FileLVI *folder = new FileLVI( parent );
@ -181,7 +181,7 @@ static FileLVI* folderLVI( KListViewItem *parent, const TQString& name )
return folder; return folder;
} }
static FileLVI* folderLVI( KListView *parent, const TQString& name ) static FileLVI* folderLVI( TDEListView *parent, const TQString& name )
{ {
FileLVI *folder = new FileLVI( parent ); FileLVI *folder = new FileLVI( parent );
folder->setText( 0, name ); folder->setText( 0, name );
@ -195,7 +195,7 @@ static FileLVI* folderLVI( KListView *parent, const TQString& name )
FileListView::FileListView(TQWidget *parent, const char* name) FileListView::FileListView(TQWidget *parent, const char* name)
: KListView(parent, name) : TDEListView(parent, name)
{ {
TQWhatsThis::add( this, TQWhatsThis::add( this,
i18n( "This area is for displaying information about the files contained within an archive." ) i18n( "This area is for displaying information about the files contained within an archive." )
@ -214,7 +214,7 @@ FileListView::FileListView(TQWidget *parent, const char* name)
int FileListView::addColumn ( const TQString & label, int width ) int FileListView::addColumn ( const TQString & label, int width )
{ {
int index = KListView::addColumn( label, width ); int index = TDEListView::addColumn( label, width );
if ( label == SIZE_COLUMN.first ) if ( label == SIZE_COLUMN.first )
{ {
m_columnMap[ index ] = sizeCol; m_columnMap[ index ] = sizeCol;
@ -246,7 +246,7 @@ void FileListView::removeColumn( int index )
} }
m_columnMap.remove( m_columnMap[ m_columnMap.count() - 1 ] ); m_columnMap.remove( m_columnMap[ m_columnMap.count() - 1 ] );
KListView::removeColumn( index ); TDEListView::removeColumn( index );
} }
columnName FileListView::nameOfColumn( int index ) columnName FileListView::nameOfColumn( int index )
@ -337,14 +337,14 @@ FileListView::contentsMousePressEvent(TQMouseEvent *e)
m_presspos = e->pos(); m_presspos = e->pos();
} }
KListView::contentsMousePressEvent(e); TDEListView::contentsMousePressEvent(e);
} }
void void
FileListView::contentsMouseReleaseEvent(TQMouseEvent *e) FileListView::contentsMouseReleaseEvent(TQMouseEvent *e)
{ {
m_pressed = false; m_pressed = false;
KListView::contentsMouseReleaseEvent(e); TDEListView::contentsMouseReleaseEvent(e);
} }
void void
@ -352,7 +352,7 @@ FileListView::contentsMouseMoveEvent(TQMouseEvent *e)
{ {
if(!m_pressed) if(!m_pressed)
{ {
KListView::contentsMouseMoveEvent(e); TDEListView::contentsMouseMoveEvent(e);
} }
else if( ( m_presspos - e->pos() ).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) else if( ( m_presspos - e->pos() ).manhattanLength() > TDEGlobalSettings::dndEventDelay() )
{ {
@ -363,7 +363,7 @@ FileListView::contentsMouseMoveEvent(TQMouseEvent *e)
} }
TQStringList dragFiles = selectedFilenames(); TQStringList dragFiles = selectedFilenames();
emit startDragRequest( dragFiles ); emit startDragRequest( dragFiles );
KListView::contentsMouseMoveEvent(e); TDEListView::contentsMouseMoveEvent(e);
} }
} }

10
ark/filelistview.h
Unescape View File

@ -45,11 +45,11 @@ class TQPoint;
enum columnName { sizeCol = 1 , packedStrCol, ratioStrCol, timeStampStrCol, otherCol }; enum columnName { sizeCol = 1 , packedStrCol, ratioStrCol, timeStampStrCol, otherCol };
class FileLVI : public KListViewItem class FileLVI : public TDEListViewItem
{ {
public: public:
FileLVI( KListView* lv ); FileLVI( TDEListView* lv );
FileLVI( KListViewItem* lvi ); FileLVI( TDEListViewItem* lvi );
TQString fileName() const { return m_entryName; } TQString fileName() const { return m_entryName; }
TDEIO::filesize_t fileSize() const { return m_fileSize; } TDEIO::filesize_t fileSize() const { return m_fileSize; }
@ -71,14 +71,14 @@ class FileLVI : public KListViewItem
typedef TQValueList< TQPair< TQString, TQt::AlignmentFlags > > ColumnList; typedef TQValueList< TQPair< TQString, TQt::AlignmentFlags > > ColumnList;
class FileListView: public KListView class FileListView: public TDEListView
{ {
Q_OBJECT Q_OBJECT
public: public:
FileListView( TQWidget *parent = 0, const char* name = 0 ); FileListView( TQWidget *parent = 0, const char* name = 0 );
FileLVI *currentItem() {return ((FileLVI *) KListView::currentItem());} FileLVI *currentItem() {return ((FileLVI *) TDEListView::currentItem());}
/** /**
* Returns the full names of the selected files. * Returns the full names of the selected files.

6
ark/mainwindow.cpp
Unescape View File

@ -109,13 +109,13 @@ MainWindow::~MainWindow()
void void
MainWindow::setupActions() MainWindow::setupActions()
{ {
newWindowAction = new KAction(i18n("New &Window"), "window_new", KShortcut(), TQT_TQOBJECT(this), newWindowAction = new TDEAction(i18n("New &Window"), "window_new", TDEShortcut(), TQT_TQOBJECT(this),
TQT_SLOT(file_newWindow()), actionCollection(), "new_window"); TQT_SLOT(file_newWindow()), actionCollection(), "new_window");
newArchAction = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(file_new()), actionCollection()); newArchAction = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(file_new()), actionCollection());
openAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_open()), actionCollection()); openAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_open()), actionCollection());
reloadAction = new KAction(i18n("Re&load"), "reload", KStdAccel::shortcut( KStdAccel::Reload ), TQT_TQOBJECT(this), reloadAction = new TDEAction(i18n("Re&load"), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), TQT_TQOBJECT(this),
TQT_SLOT(file_reload()), actionCollection(), "reload_arch"); TQT_SLOT(file_reload()), actionCollection(), "reload_arch");
closeAction = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(file_close()), actionCollection(), "file_close"); closeAction = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(file_close()), actionCollection(), "file_close");
@ -204,7 +204,7 @@ MainWindow::slotConfigureKeyBindings()
void void
MainWindow::slotArchivePopup( const TQPoint &pPoint) MainWindow::slotArchivePopup( const TQPoint &pPoint)
{ {
static_cast<KPopupMenu *>(factory()->container("archive_popup", this))->popup(pPoint); static_cast<TDEPopupMenu *>(factory()->container("archive_popup", this))->popup(pPoint);
} }
// see if the ark is already open in another window // see if the ark is already open in another window

12
ark/mainwindow.h
Unescape View File

@ -98,12 +98,12 @@ private: // data
KParts::ReadWritePart *m_part; KParts::ReadWritePart *m_part;
ArkWidget *m_widget; //the parts widget ArkWidget *m_widget; //the parts widget
KAction *newWindowAction; TDEAction *newWindowAction;
KAction *newArchAction; TDEAction *newArchAction;
KAction *openAction; TDEAction *openAction;
KAction *closeAction; TDEAction *closeAction;
KAction *reloadAction; TDEAction *reloadAction;
KRecentFilesAction *recent; TDERecentFilesAction *recent;
//progress dialog for konqs service menus / commmand line //progress dialog for konqs service menus / commmand line
KProgressDialog *progressDialog; KProgressDialog *progressDialog;

6
ark/searchbar.cpp
Unescape View File

@ -32,10 +32,10 @@
#include <tqapplication.h> #include <tqapplication.h>
#include <tqvaluelist.h> #include <tqvaluelist.h>
SearchBar::SearchBar( TQWidget* parent, KActionCollection* aC, const char * name ) SearchBar::SearchBar( TQWidget* parent, TDEActionCollection* aC, const char * name )
: KListViewSearchLine( parent, 0, name ) : TDEListViewSearchLine( parent, 0, name )
{ {
KAction *resetSearch = new KAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, TQT_TQOBJECT(this), TQT_SLOT( clear() ), aC, "reset_search" ); TDEAction *resetSearch = new TDEAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, TQT_TQOBJECT(this), TQT_SLOT( clear() ), aC, "reset_search" );
resetSearch->plug( parent ); resetSearch->plug( parent );
resetSearch->setWhatsThis( i18n( "Reset Search\n" resetSearch->setWhatsThis( i18n( "Reset Search\n"

8
ark/searchbar.h
Unescape View File

@ -25,16 +25,16 @@
#include <tqwidget.h> #include <tqwidget.h>
class KListView; class TDEListView;
class KComboBox; class KComboBox;
class KActionCollection; class TDEActionCollection;
class SearchBar: public KListViewSearchLine class SearchBar: public TDEListViewSearchLine
{ {
Q_OBJECT Q_OBJECT
public: public:
SearchBar( TQWidget* parent, KActionCollection* aC, const char * name = 0 ); SearchBar( TQWidget* parent, TDEActionCollection* aC, const char * name = 0 );
~SearchBar(); ~SearchBar();
}; };

2
kcalc/ChangeLog
Unescape View File

@ -239,7 +239,7 @@
* Caption is set via signal/slots * Caption is set via signal/slots
* Fixed "%"-mode to make it again more conformant with documentation. * Fixed "%"-mode to make it again more conformant with documentation.
"x^y%" does still not work. Did it ever? "x^y%" does still not work. Did it ever?
* Number-keys are now handled by KAccel instead of keyPressEvent * Number-keys are now handled by TDEAccel instead of keyPressEvent
* ConfigDialog is modal * ConfigDialog is modal
2003-08-27 Klaus Niederkrüger <kniederk@math.uni-koeln.de> 2003-08-27 Klaus Niederkrüger <kniederk@math.uni-koeln.de>

2
kcalc/dlabel.cpp
Unescape View File

@ -35,7 +35,7 @@
DispLogic::DispLogic(TQWidget *parent, const char *name, DispLogic::DispLogic(TQWidget *parent, const char *name,
KActionCollection *coll) TDEActionCollection *coll)
:KCalcDisplay(parent,name), _history_index(0) :KCalcDisplay(parent,name), _history_index(0)
{ {
KNumber::setDefaultFloatOutput(true); KNumber::setDefaultFloatOutput(true);

10
kcalc/dlabel.h
Unescape View File

@ -32,8 +32,8 @@
#include "kcalcdisplay.h" #include "kcalcdisplay.h"
class CalcEngine; class CalcEngine;
class KAction; class TDEAction;
class KActionCollection; class TDEActionCollection;
class DispLogic : public KCalcDisplay class DispLogic : public KCalcDisplay
{ {
@ -42,7 +42,7 @@ Q_OBJECT
public: public:
DispLogic(TQWidget *parent, const char *name, DispLogic(TQWidget *parent, const char *name,
KActionCollection *coll); TDEActionCollection *coll);
~DispLogic(); ~DispLogic();
void changeSettings(); void changeSettings();
@ -58,8 +58,8 @@ private:
TQValueVector<KNumber> _history_list; TQValueVector<KNumber> _history_list;
int _history_index; int _history_index;
KAction *_forward; TDEAction *_forward;
KAction *_back; TDEAction *_back;
}; };
#endif #endif

24
kcalc/kcalc.cpp
Unescape View File

@ -79,14 +79,14 @@ static const char version[] = KCALCVERSION;
KCalculator::KCalculator(TQWidget *parent, const char *name) KCalculator::KCalculator(TQWidget *parent, const char *name)
: KMainWindow(parent, name), inverse(false), : TDEMainWindow(parent, name), inverse(false),
hyp_mode(false), memory_num(0.0), calc_display(NULL), hyp_mode(false), memory_num(0.0), calc_display(NULL),
mInternalSpacing(4), core() mInternalSpacing(4), core()
{ {
/* central widget to contain all the elements */ /* central widget to contain all the elements */
TQWidget *central = new TQWidget(this); TQWidget *central = new TQWidget(this);
setCentralWidget(central); setCentralWidget(central);
KAcceleratorManager::setNoAccel( central ); TDEAcceleratorManager::setNoAccel( central );
// Detect color change // Detect color change
connect(kapp,TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(set_colors())); connect(kapp,TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(set_colors()));
@ -132,7 +132,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
TQToolTip::add(pbAngleChoose, i18n("Choose the unit for the angle measure")); TQToolTip::add(pbAngleChoose, i18n("Choose the unit for the angle measure"));
pbAngleChoose->setAutoDefault(false); pbAngleChoose->setAutoDefault(false);
KPopupMenu *angle_menu = new KPopupMenu(pbAngleChoose, "AngleMode-Selection-Menu"); TDEPopupMenu *angle_menu = new TDEPopupMenu(pbAngleChoose, "AngleMode-Selection-Menu");
angle_menu->insertItem(i18n("Degrees"), 0); angle_menu->insertItem(i18n("Degrees"), 0);
angle_menu->insertItem(i18n("Radians"), 1); angle_menu->insertItem(i18n("Radians"), 1);
angle_menu->insertItem(i18n("Gradians"), 2); angle_menu->insertItem(i18n("Gradians"), 2);
@ -417,35 +417,35 @@ void KCalculator::setupMainActions(void)
KStdAction::paste(TQT_TQOBJECT(calc_display), TQT_SLOT(slotPaste()), actionCollection()); KStdAction::paste(TQT_TQOBJECT(calc_display), TQT_SLOT(slotPaste()), actionCollection());
// settings menu // settings menu
actionStatshow = new KToggleAction(i18n("&Statistic Buttons"), 0, actionStatshow = new TDEToggleAction(i18n("&Statistic Buttons"), 0,
actionCollection(), "show_stat"); actionCollection(), "show_stat");
actionStatshow->setChecked(true); actionStatshow->setChecked(true);
connect(actionStatshow, TQT_SIGNAL(toggled(bool)), connect(actionStatshow, TQT_SIGNAL(toggled(bool)),
TQT_SLOT(slotStatshow(bool))); TQT_SLOT(slotStatshow(bool)));
actionScientificshow = new KToggleAction(i18n("Science/&Engineering Buttons"), actionScientificshow = new TDEToggleAction(i18n("Science/&Engineering Buttons"),
0, actionCollection(), "show_science"); 0, actionCollection(), "show_science");
actionScientificshow->setChecked(true); actionScientificshow->setChecked(true);
connect(actionScientificshow, TQT_SIGNAL(toggled(bool)), connect(actionScientificshow, TQT_SIGNAL(toggled(bool)),
TQT_SLOT(slotScientificshow(bool))); TQT_SLOT(slotScientificshow(bool)));
actionLogicshow = new KToggleAction(i18n("&Logic Buttons"), 0, actionLogicshow = new TDEToggleAction(i18n("&Logic Buttons"), 0,
actionCollection(), "show_logic"); actionCollection(), "show_logic");
actionLogicshow->setChecked(true); actionLogicshow->setChecked(true);
connect(actionLogicshow, TQT_SIGNAL(toggled(bool)), connect(actionLogicshow, TQT_SIGNAL(toggled(bool)),
TQT_SLOT(slotLogicshow(bool))); TQT_SLOT(slotLogicshow(bool)));
actionConstantsShow = new KToggleAction(i18n("&Constants Buttons"), 0, actionConstantsShow = new TDEToggleAction(i18n("&Constants Buttons"), 0,
actionCollection(), "show_constants"); actionCollection(), "show_constants");
actionConstantsShow->setChecked(true); actionConstantsShow->setChecked(true);
connect(actionConstantsShow, TQT_SIGNAL(toggled(bool)), connect(actionConstantsShow, TQT_SIGNAL(toggled(bool)),
TQT_SLOT(slotConstantsShow(bool))); TQT_SLOT(slotConstantsShow(bool)));
(void) new KAction(i18n("&Show All"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowAll()), (void) new TDEAction(i18n("&Show All"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowAll()),
actionCollection(), "show_all"); actionCollection(), "show_all");
(void) new KAction(i18n("&Hide All"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAll()), (void) new TDEAction(i18n("&Hide All"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAll()),
actionCollection(), "hide_all"); actionCollection(), "hide_all");
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection()); KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection());
@ -1825,8 +1825,8 @@ void KCalculator::showSettings()
TQWidget *fontWidget = new TQWidget(0,"Font"); TQWidget *fontWidget = new TQWidget(0,"Font");
TQVBoxLayout *fontLayout = new TQVBoxLayout(fontWidget); TQVBoxLayout *fontLayout = new TQVBoxLayout(fontWidget);
KFontChooser *mFontChooser = TDEFontChooser *mFontChooser =
new KFontChooser(fontWidget, "kcfg_Font", false, TQStringList(), false, 6); new TDEFontChooser(fontWidget, "kcfg_Font", false, TQStringList(), false, 6);
fontLayout->addWidget(mFontChooser); fontLayout->addWidget(mFontChooser);
dialog->addPage(fontWidget, i18n("Font"), "fonts", i18n("Select Display Font")); dialog->addPage(fontWidget, i18n("Font"), "fonts", i18n("Select Display Font"));
@ -2253,7 +2253,7 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e)
} }
else else
{ {
return KMainWindow::eventFilter(o, e); return TDEMainWindow::eventFilter(o, e);
} }
} }

10
kcalc/kcalc.h
Unescape View File

@ -58,7 +58,7 @@ class Constants;
#include "kcalc_button.h" #include "kcalc_button.h"
#include "kcalc_const_button.h" #include "kcalc_const_button.h"
class KCalculator : public KMainWindow class KCalculator : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -222,10 +222,10 @@ private:
// ConstButtonGroup C1-C6 // ConstButtonGroup C1-C6
TQButtonGroup* ConstButtonGroup; TQButtonGroup* ConstButtonGroup;
KToggleAction *actionStatshow; TDEToggleAction *actionStatshow;
KToggleAction *actionScientificshow; TDEToggleAction *actionScientificshow;
KToggleAction *actionLogicshow; TDEToggleAction *actionLogicshow;
KToggleAction *actionConstantsShow; TDEToggleAction *actionConstantsShow;
TQPtrList<KCalcButton> mFunctionButtonList; TQPtrList<KCalcButton> mFunctionButtonList;
TQPtrList<KCalcButton> mStatButtonList; TQPtrList<KCalcButton> mStatButtonList;

2
kcalc/kcalc_const_button.cpp
Unescape View File

@ -70,7 +70,7 @@ void KCalcConstButton::initPopupMenu(void)
{ {
KCalcConstMenu *tmp_menu = new KCalcConstMenu(this); KCalcConstMenu *tmp_menu = new KCalcConstMenu(this);
_popup = new KPopupMenu(this, "set const-cutton"); _popup = new TDEPopupMenu(this, "set const-cutton");
_popup->insertItem(i18n("Set Name"), 0); _popup->insertItem(i18n("Set Name"), 0);
_popup->insertItem(i18n("Choose From List"), tmp_menu, 1); _popup->insertItem(i18n("Choose From List"), tmp_menu, 1);

2
kcalc/kcalc_const_button.h
Unescape View File

@ -51,7 +51,7 @@ Q_OBJECT
private: private:
void initPopupMenu(void); void initPopupMenu(void);
KPopupMenu* _popup; TDEPopupMenu* _popup;
int _button_num; int _button_num;
}; };

20
kcharselect/kcharselectdia.cc
Unescape View File

@ -24,7 +24,7 @@
KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name, KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
const TQChar &_chr,const TQString &_font, const TQChar &_chr,const TQString &_font,
int _tableNum, bool direction) int _tableNum, bool direction)
: KMainWindow(parent,name), vChr(_chr), vFont(_font) : TDEMainWindow(parent,name), vChr(_chr), vFont(_font)
{ {
setCaption(TQString()); // Standard caption setCaption(TQString()); // Standard caption
@ -79,25 +79,25 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
// Build menu // Build menu
KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(_exit()), actionCollection() ); KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(_exit()), actionCollection() );
new KAction(i18n("&To Clipboard"), "editcopy", new TDEAction(i18n("&To Clipboard"), "editcopy",
KStdAccel::shortcut(KStdAccel::Copy), TQT_TQOBJECT(this), TQT_SLOT(toClip()), actionCollection(), "copy_clip" ); TDEStdAccel::shortcut(TDEStdAccel::Copy), TQT_TQOBJECT(this), TQT_SLOT(toClip()), actionCollection(), "copy_clip" );
(void)new KAction(i18n("To Clipboard &UTF-8"), 0, TQT_TQOBJECT(this), (void)new TDEAction(i18n("To Clipboard &UTF-8"), 0, TQT_TQOBJECT(this),
TQT_SLOT(toClipUTF8()), actionCollection(), "copy_utf_8" ); TQT_SLOT(toClipUTF8()), actionCollection(), "copy_utf_8" );
(void)new KAction(i18n("To Clipboard &HTML"), 0, TQT_TQOBJECT(this), (void)new TDEAction(i18n("To Clipboard &HTML"), 0, TQT_TQOBJECT(this),
TQT_SLOT(toClipHTML()), actionCollection(), "copy_html" ); TQT_SLOT(toClipHTML()), actionCollection(), "copy_html" );
new KAction(i18n("&From Clipboard"), "editpaste", new TDEAction(i18n("&From Clipboard"), "editpaste",
KStdAccel::shortcut(KStdAccel::Paste), TQT_TQOBJECT(this), TQT_SLOT(fromClip()), actionCollection(), "from_clip" ); TDEStdAccel::shortcut(TDEStdAccel::Paste), TQT_TQOBJECT(this), TQT_SLOT(fromClip()), actionCollection(), "from_clip" );
(void)new KAction(i18n("From Clipboard UTF-8"), 0, TQT_TQOBJECT(this), (void)new TDEAction(i18n("From Clipboard UTF-8"), 0, TQT_TQOBJECT(this),
TQT_SLOT(fromClipUTF8()), actionCollection(), "from_clip_utf8" ); TQT_SLOT(fromClipUTF8()), actionCollection(), "from_clip_utf8" );
i18n("From Clipboard HTML"); // Intended for future use i18n("From Clipboard HTML"); // Intended for future use
KStdAction::clear(TQT_TQOBJECT(this), TQT_SLOT(clear()), actionCollection(), "clear"); KStdAction::clear(TQT_TQOBJECT(this), TQT_SLOT(clear()), actionCollection(), "clear");
(void)new KAction(i18n("&Flip"), 0, TQT_TQOBJECT(this), (void)new TDEAction(i18n("&Flip"), 0, TQT_TQOBJECT(this),
TQT_SLOT(flipText()), actionCollection(), "flip" ); TQT_SLOT(flipText()), actionCollection(), "flip" );
(void)new KAction(i18n("&Alignment"), 0, TQT_TQOBJECT(this), (void)new TDEAction(i18n("&Alignment"), 0, TQT_TQOBJECT(this),
TQT_SLOT(toggleEntryDirection()), actionCollection(), "alignment" ); TQT_SLOT(toggleEntryDirection()), actionCollection(), "alignment" );
charSelect->setFocus(); charSelect->setFocus();

2
kcharselect/kcharselectdia.h
Unescape View File

@ -22,7 +22,7 @@ static const char *version = "v1.1";
/* class KCharSelectDia */ /* class KCharSelectDia */
/******************************************************************/ /******************************************************************/
class KCharSelectDia : public KMainWindow class KCharSelectDia : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT

4
kdelirc/irkick/irkick.h
Unescape View File

@ -33,8 +33,8 @@ class IRKTrayIcon: public KSystemTray
void mousePressEvent(TQMouseEvent *e); void mousePressEvent(TQMouseEvent *e);
public: public:
KPopupMenu* contextMenu() const { return KSystemTray::contextMenu(); } TDEPopupMenu* contextMenu() const { return KSystemTray::contextMenu(); }
KActionCollection* actionCollection() { return KSystemTray::actionCollection(); } TDEActionCollection* actionCollection() { return KSystemTray::actionCollection(); }
IRKTrayIcon(TQWidget *parent = 0, const char *name = 0): KSystemTray(parent, name) {} IRKTrayIcon(TQWidget *parent = 0, const char *name = 0): KSystemTray(parent, name) {}
}; };

8
kdelirc/kcmlirc/addaction.cpp
Unescape View File

@ -228,7 +228,7 @@ void AddAction::updateParameters()
{ {
Prototype p(theFunctions->currentItem()->text(2)); Prototype p(theFunctions->currentItem()->text(2));
for(unsigned k = 0; k < p.count(); k++) for(unsigned k = 0; k < p.count(); k++)
{ new KListViewItem(theParameters, p.name(k).isEmpty() ? i18n( "<anonymous>" ) : p.name(k), "", p.type(k), TQString().setNum(k + 1)); { new TDEListViewItem(theParameters, p.name(k).isEmpty() ? i18n( "<anonymous>" ) : p.name(k), "", p.type(k), TQString().setNum(k + 1));
theArguments.append(TQVariant("")); theArguments.append(TQVariant(""));
theArguments.back().cast(TQVariant::nameToType(p.type(k).utf8())); theArguments.back().cast(TQVariant::nameToType(p.type(k).utf8()));
} }
@ -346,14 +346,14 @@ void AddAction::updateObjects()
if(names.contains(name)) continue; if(names.contains(name)) continue;
names += name; names += name;
KListViewItem *a = new KListViewItem(theObjects, name); TDEListViewItem *a = new TDEListViewItem(theObjects, name);
uniqueProgramMap[a] = name == TQString(*i); uniqueProgramMap[a] = name == TQString(*i);
nameProgramMap[a] = *i; nameProgramMap[a] = *i;
QCStringList theObjects = theClient->remoteObjects(*i); QCStringList theObjects = theClient->remoteObjects(*i);
for(QCStringList::iterator j = theObjects.begin(); j != theObjects.end(); ++j) for(QCStringList::iterator j = theObjects.begin(); j != theObjects.end(); ++j)
if(*j != "tdesycoca" && *j != "qt")// && getFunctions(*i, *j).count()) if(*j != "tdesycoca" && *j != "qt")// && getFunctions(*i, *j).count())
new KListViewItem(a, *j); new TDEListViewItem(a, *j);
} }
updateFunctions(); updateFunctions();
} }
@ -365,7 +365,7 @@ void AddAction::updateFunctions()
{ TQStringList functions = getFunctions(nameProgramMap[theObjects->currentItem()->parent()], theObjects->currentItem()->text(0)); { TQStringList functions = getFunctions(nameProgramMap[theObjects->currentItem()->parent()], theObjects->currentItem()->text(0));
for(TQStringList::iterator i = functions.begin(); i != functions.end(); ++i) for(TQStringList::iterator i = functions.begin(); i != functions.end(); ++i)
{ Prototype p((TQString)(*i)); { Prototype p((TQString)(*i));
new KListViewItem(theFunctions, p.name(), p.argumentList(), *i); new TDEListViewItem(theFunctions, p.name(), p.argumentList(), *i);
} }
} }
updateOptions(); updateOptions();

14
kdelirc/kcmlirc/addactionbase.ui
Unescape View File

@ -88,7 +88,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Applications</string> <string>Applications</string>
@ -252,7 +252,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Button</string> <string>Button</string>
@ -318,7 +318,7 @@
<property name="orientation"> <property name="orientation">
<enum>Horizontal</enum> <enum>Horizontal</enum>
</property> </property>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Program</string> <string>Program</string>
@ -423,7 +423,7 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Function</string> <string>Function</string>
@ -535,7 +535,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Function</string> <string>Function</string>
@ -626,7 +626,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Option Description</string> <string>Option Description</string>
@ -1241,7 +1241,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Mode</string> <string>Mode</string>

14
kdelirc/kcmlirc/kcmlirc.cpp
Unescape View File

@ -78,7 +78,7 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC
connect(theKCMLircBase->theActions, TQT_SIGNAL( currentChanged(TQListViewItem *) ), this, TQT_SLOT( updateActionsStatus(TQListViewItem *) )); connect(theKCMLircBase->theActions, TQT_SIGNAL( currentChanged(TQListViewItem *) ), this, TQT_SLOT( updateActionsStatus(TQListViewItem *) ));
connect(theKCMLircBase->theExtensions, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateInformation() )); connect(theKCMLircBase->theExtensions, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateInformation() ));
connect(theKCMLircBase->theModes, TQT_SIGNAL( itemRenamed(TQListViewItem *) ), this, TQT_SLOT( slotRenamed(TQListViewItem *) )); connect(theKCMLircBase->theModes, TQT_SIGNAL( itemRenamed(TQListViewItem *) ), this, TQT_SLOT( slotRenamed(TQListViewItem *) ));
connect(theKCMLircBase->theModes, TQT_SIGNAL(dropped(KListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDrop(KListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*))); connect(theKCMLircBase->theModes, TQT_SIGNAL(dropped(TDEListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDrop(TDEListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)));
connect((TQObject *)(theKCMLircBase->theAddActions), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddActions() )); connect((TQObject *)(theKCMLircBase->theAddActions), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddActions() ));
connect((TQObject *)(theKCMLircBase->theAddAction), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddAction() )); connect((TQObject *)(theKCMLircBase->theAddAction), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddAction() ));
connect((TQObject *)(theKCMLircBase->theEditAction), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditAction() )); connect((TQObject *)(theKCMLircBase->theEditAction), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditAction() ));
@ -170,7 +170,7 @@ void KCMLirc::slotAddAction()
theDialog.theModes->setEnabled(item->firstChild()); theDialog.theModes->setEnabled(item->firstChild());
theDialog.theSwitchMode->setEnabled(item->firstChild()); theDialog.theSwitchMode->setEnabled(item->firstChild());
for(item = item->firstChild(); item; item = item->nextSibling()) for(item = item->firstChild(); item; item = item->nextSibling())
{ KListViewItem *a = new KListViewItem(theDialog.theModes, item->text(0)); { TDEListViewItem *a = new TDEListViewItem(theDialog.theModes, item->text(0));
if(item->isSelected()) { a->setSelected(true); theDialog.theModes->setCurrentItem(a); } if(item->isSelected()) { a->setSelected(true); theDialog.theModes->setCurrentItem(a); }
} }
@ -286,7 +286,7 @@ void KCMLirc::slotAddMode()
TQListViewItem *tr = theKCMLircBase->theModes->selectedItem(); TQListViewItem *tr = theKCMLircBase->theModes->selectedItem();
if(tr) if(tr->parent()) tr = tr->parent(); if(tr) if(tr->parent()) tr = tr->parent();
for(TQListViewItem *i = theKCMLircBase->theModes->firstChild(); i; i = i->nextSibling()) for(TQListViewItem *i = theKCMLircBase->theModes->firstChild(); i; i = i->nextSibling())
{ KListViewItem *a = new KListViewItem(theDialog.theRemotes, i->text(0)); { TDEListViewItem *a = new TDEListViewItem(theDialog.theRemotes, i->text(0));
remoteMap[a] = modeMap[i].remote(); remoteMap[a] = modeMap[i].remote();
if(i == tr) { a->setSelected(true); theDialog.theRemotes->setCurrentItem(a); } if(i == tr) { a->setSelected(true); theDialog.theRemotes->setCurrentItem(a); }
} }
@ -349,7 +349,7 @@ void KCMLirc::slotSetDefaultMode()
emit changed(true); emit changed(true);
} }
void KCMLirc::slotDrop(KListView *, TQDropEvent *, TQListViewItem *, TQListViewItem *after) void KCMLirc::slotDrop(TDEListView *, TQDropEvent *, TQListViewItem *, TQListViewItem *after)
{ {
Mode m = modeMap[after]; Mode m = modeMap[after];
@ -380,7 +380,7 @@ void KCMLirc::updateActions()
theKCMLircBase->theModeLabel->setText(m.remoteName() + ": " + (m.name().isEmpty() ? i18n("Actions <i>always</i> available") : i18n("Actions available only in mode <b>%1</b>").arg(m.name()))); theKCMLircBase->theModeLabel->setText(m.remoteName() + ": " + (m.name().isEmpty() ? i18n("Actions <i>always</i> available") : i18n("Actions available only in mode <b>%1</b>").arg(m.name())));
IRAItList l = allActions.findByMode(m); IRAItList l = allActions.findByMode(m);
for(IRAItList::iterator i = l.begin(); i != l.end(); ++i) for(IRAItList::iterator i = l.begin(); i != l.end(); ++i)
{ TQListViewItem *b = new KListViewItem(theKCMLircBase->theActions, (**i).buttonName(), (**i).application(), (**i).function(), (**i).arguments().toString(), (**i).notes()); { TQListViewItem *b = new TDEListViewItem(theKCMLircBase->theActions, (**i).buttonName(), (**i).application(), (**i).function(), (**i).arguments().toString(), (**i).notes());
actionMap[b] = *i; actionMap[b] = *i;
if(*i == oldCurrent) { b->setSelected(true); theKCMLircBase->theActions->setCurrentItem(b); } if(*i == oldCurrent) { b->setSelected(true); theKCMLircBase->theActions->setCurrentItem(b); }
} }
@ -411,7 +411,7 @@ void KCMLirc::updateModes()
theKCMLircBase->theMainLabel->setMaximumSize(0, 0); theKCMLircBase->theMainLabel->setMaximumSize(0, 0);
for(TQStringList::iterator i = remotes.begin(); i != remotes.end(); ++i) for(TQStringList::iterator i = remotes.begin(); i != remotes.end(); ++i)
{ Mode mode = allModes.getMode(*i, ""); { Mode mode = allModes.getMode(*i, "");
TQListViewItem *a = new KListViewItem(theKCMLircBase->theModes, RemoteServer::remoteServer()->getRemoteName(*i), allModes.isDefault(mode) ? "Default" : "", mode.iconFile().isNull() ? "" : ""); TQListViewItem *a = new TDEListViewItem(theKCMLircBase->theModes, RemoteServer::remoteServer()->getRemoteName(*i), allModes.isDefault(mode) ? "Default" : "", mode.iconFile().isNull() ? "" : "");
if(!mode.iconFile().isNull()) if(!mode.iconFile().isNull())
a->setPixmap(2, KIconLoader().loadIcon(mode.iconFile(), KIcon::Panel)); a->setPixmap(2, KIconLoader().loadIcon(mode.iconFile(), KIcon::Panel));
modeMap[a] = mode; // the null mode modeMap[a] = mode; // the null mode
@ -420,7 +420,7 @@ void KCMLirc::updateModes()
ModeList l = allModes.getModes(*i); ModeList l = allModes.getModes(*i);
for(ModeList::iterator j = l.begin(); j != l.end(); ++j) for(ModeList::iterator j = l.begin(); j != l.end(); ++j)
if(!(*j).name().isEmpty()) if(!(*j).name().isEmpty())
{ TQListViewItem *b = new KListViewItem(a, (*j).name(), allModes.isDefault(*j) ? i18n("Default") : "", (*j).iconFile().isNull() ? "" : ""); { TQListViewItem *b = new TDEListViewItem(a, (*j).name(), allModes.isDefault(*j) ? i18n("Default") : "", (*j).iconFile().isNull() ? "" : "");
if(!(*j).iconFile().isNull()) if(!(*j).iconFile().isNull())
b->setPixmap(2, KIconLoader().loadIcon((*j).iconFile(), KIcon::Panel)); b->setPixmap(2, KIconLoader().loadIcon((*j).iconFile(), KIcon::Panel));
modeMap[b] = *j; modeMap[b] = *j;

4
kdelirc/kcmlirc/kcmlirc.h
Unescape View File

@ -23,7 +23,7 @@
#include "modes.h" #include "modes.h"
class TQListViewItem; class TQListViewItem;
class KListView; class TDEListView;
class TQDropEvent; class TQDropEvent;
class Profile; class Profile;
class Remote; class Remote;
@ -58,7 +58,7 @@ public slots:
void slotAddActions(); void slotAddActions();
void slotEditAction(); void slotEditAction();
void slotRemoveAction(); void slotRemoveAction();
void slotDrop(KListView *, TQDropEvent *, TQListViewItem *, TQListViewItem *after); void slotDrop(TDEListView *, TQDropEvent *, TQListViewItem *, TQListViewItem *after);
void slotRenamed(TQListViewItem *item); void slotRenamed(TQListViewItem *item);
void slotEditMode(); void slotEditMode();

8
kdelirc/kcmlirc/kcmlircbase.ui
Unescape View File

@ -104,7 +104,7 @@
<string>Remote controls and modes:</string> <string>Remote controls and modes:</string>
</property> </property>
</widget> </widget>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>New Column</string> <string>New Column</string>
@ -221,7 +221,7 @@
<string></string> <string></string>
</property> </property>
</widget> </widget>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Button</string> <string>Button</string>
@ -405,7 +405,7 @@
<property name="orientation"> <property name="orientation">
<enum>Horizontal</enum> <enum>Horizontal</enum>
</property> </property>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Name</string> <string>Name</string>
@ -446,7 +446,7 @@
<string></string> <string></string>
</property> </property>
</widget> </widget>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Name</string> <string>Name</string>

2
kdelirc/kcmlirc/modeslist.cpp
Unescape View File

@ -16,7 +16,7 @@
#include "modeslist.h" #include "modeslist.h"
ModesList::ModesList(TQWidget *parent, const char *name) : KListView(parent, name) ModesList::ModesList(TQWidget *parent, const char *name) : TDEListView(parent, name)
{ {
setAcceptDrops(true); setAcceptDrops(true);
setDropVisualizer(false); setDropVisualizer(false);

2
kdelirc/kcmlirc/modeslist.h
Unescape View File

@ -22,7 +22,7 @@
@author Gav Wood @author Gav Wood
*/ */
class ModesList : public KListView class ModesList : public TDEListView
{ {
Q_OBJECT Q_OBJECT

2
kdelirc/kcmlirc/newmode.ui
Unescape View File

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

2
kdelirc/kcmlirc/selectprofile.ui
Unescape View File

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

6
kdf/kdf.cpp
Unescape View File

@ -37,11 +37,11 @@ static const char version[] = "v0.5";
/***************************************************************/ /***************************************************************/
KDFTopLevel::KDFTopLevel(TQWidget *, const char *name) KDFTopLevel::KDFTopLevel(TQWidget *, const char *name)
: KMainWindow(0, name) : TDEMainWindow(0, name)
{ {
kdf = new KDFWidget(this,"kdf",FALSE); kdf = new KDFWidget(this,"kdf",FALSE);
TQ_CHECK_PTR(kdf); TQ_CHECK_PTR(kdf);
(void) new KAction( i18n( "&Update" ), 0, TQT_TQOBJECT(kdf), TQT_SLOT( updateDF() ), actionCollection(), "updatedf" ); (void) new TDEAction( i18n( "&Update" ), 0, TQT_TQOBJECT(kdf), TQT_SLOT( updateDF() ), actionCollection(), "updatedf" );
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
KStdAction::preferences(TQT_TQOBJECT(kdf), TQT_SLOT(settingsBtnClicked()), actionCollection()); KStdAction::preferences(TQT_TQOBJECT(kdf), TQT_SLOT(settingsBtnClicked()), actionCollection());
@ -50,7 +50,7 @@ actionCollection());
setCentralWidget(kdf); setCentralWidget(kdf);
// kdf->setMinimumSize(kdf->sizeHint()); // kdf->setMinimumSize(kdf->sizeHint());
kdf->resize(kdf->sizeHint()); kdf->resize(kdf->sizeHint());
setupGUI(KMainWindow::Keys | StatusBar | Save | Create); setupGUI(TDEMainWindow::Keys | StatusBar | Save | Create);
} }

2
kdf/kdf.h
Unescape View File

@ -28,7 +28,7 @@
#include "kdfwidget.h" #include "kdfwidget.h"
/***************************************************************/ /***************************************************************/
class KDFTopLevel : public KMainWindow class KDFTopLevel : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT

2
kdf/kdfwidget.cpp
Unescape View File

@ -464,7 +464,7 @@ void KDFWidget::popupMenu( TQListViewItem *item, const TQPoint &p )
return; return;
} }
mPopup = new KPopupMenu( 0 ); mPopup = new TDEPopupMenu( 0 );
mPopup->insertTitle( disk->mountPoint() ); mPopup->insertTitle( disk->mountPoint() );
mPopup->insertItem( i18n("Mount Device"), 0 ); mPopup->insertItem( i18n("Mount Device"), 0 );
mPopup->insertItem( i18n("Unmount Device"), 1 ); mPopup->insertItem( i18n("Unmount Device"), 1 );

4
kdf/kdfwidget.h
Unescape View File

@ -39,7 +39,7 @@
class CListView; class CListView;
class COptionDialog; class COptionDialog;
class TQTimer; class TQTimer;
class KPopupMenu; class TDEPopupMenu;
/**************************************************************/ /**************************************************************/
@ -143,7 +143,7 @@ class KDFWidget : public TQWidget
TQMemArray<CTabEntry*> mTabProp; TQMemArray<CTabEntry*> mTabProp;
CListView *mList; CListView *mList;
COptionDialog *mOptionDialog; COptionDialog *mOptionDialog;
KPopupMenu *mPopup; TDEPopupMenu *mPopup;
TQTimer *mTimer; TQTimer *mTimer;
DiskList mDiskList; DiskList mDiskList;
bool mIsTopLevel; bool mIsTopLevel;

2
kdf/listview.cpp
Unescape View File

@ -35,7 +35,7 @@
template class TQDict<TQPixmap>; template class TQDict<TQPixmap>;
CListView::CListView( TQWidget *parent, const char *name, int visibleItem ) CListView::CListView( TQWidget *parent, const char *name, int visibleItem )
:KListView( parent, name ), mVisibleItem(TQMAX( 1, visibleItem )) :TDEListView( parent, name ), mVisibleItem(TQMAX( 1, visibleItem ))
{ {
setVisibleItem(visibleItem); setVisibleItem(visibleItem);
mPixDict.setAutoDelete(true); mPixDict.setAutoDelete(true);

2
kdf/listview.h
Unescape View File

@ -25,7 +25,7 @@
#include <klistview.h> #include <klistview.h>
class CListView : public KListView class CListView : public TDEListView
{ {
Q_OBJECT Q_OBJECT

10
kedit/kedit.cpp
Unescape View File

@ -61,7 +61,7 @@ TQPtrList<TopLevel> *TopLevel::windowList = 0;
int default_open = TopLevel::OPEN_READWRITE; int default_open = TopLevel::OPEN_READWRITE;
TopLevel::TopLevel (TQWidget *, const char *name) TopLevel::TopLevel (TQWidget *, const char *name)
: KMainWindow ( 0,name ), tdespellconfigOptions(0), : TDEMainWindow ( 0,name ), tdespellconfigOptions(0),
eframe(0), newWindow(false), tdespell(0) eframe(0), newWindow(false), tdespell(0)
{ {
if (!windowList) if (!windowList)
@ -217,11 +217,11 @@ void TopLevel::setupActions()
KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(search_again()), actionCollection()); KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(search_again()), actionCollection());
KStdAction::replace(TQT_TQOBJECT(this), TQT_SLOT(replace()), actionCollection()); KStdAction::replace(TQT_TQOBJECT(this), TQT_SLOT(replace()), actionCollection());
(void)new KAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(file_insert()), (void)new TDEAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(file_insert()),
actionCollection(), "insert_file"); actionCollection(), "insert_file");
(void)new KAction(i18n("In&sert Date"), 0, TQT_TQOBJECT(this), TQT_SLOT(insertDate()), (void)new TDEAction(i18n("In&sert Date"), 0, TQT_TQOBJECT(this), TQT_SLOT(insertDate()),
actionCollection(), "insert_date"); actionCollection(), "insert_date");
(void)new KAction(i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(clean_space()), (void)new TDEAction(i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(clean_space()),
actionCollection(), "clean_spaces"); actionCollection(), "clean_spaces");
// setup Tools menu // setup Tools menu
@ -1324,7 +1324,7 @@ SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkele
// Font // Font
TQWidget *font = new TQWidget(0, "FontSetting"); TQWidget *font = new TQWidget(0, "FontSetting");
TQVBoxLayout *topLayout = new TQVBoxLayout(font, 0, KDialog::spacingHint()); TQVBoxLayout *topLayout = new TQVBoxLayout(font, 0, KDialog::spacingHint());
KFontChooser *mFontChooser = new KFontChooser(font, "kcfg_Font", false, TQStringList(), false, 6); TDEFontChooser *mFontChooser = new TDEFontChooser(font, "kcfg_Font", false, TQStringList(), false, 6);
topLayout->addWidget(mFontChooser); topLayout->addWidget(mFontChooser);
addPage(font, i18n("Font"), "fonts", i18n("Editor Font")); addPage(font, i18n("Font"), "fonts", i18n("Editor Font"));

16
kedit/kedit.h
Unescape View File

@ -35,8 +35,8 @@ class KEdit;
class KSpell; class KSpell;
class KSpellConfig; class KSpellConfig;
class TQTimer; class TQTimer;
class KAction; class TDEAction;
class KRecentFilesAction; class TDERecentFilesAction;
namespace TDEIO { class Job; } namespace TDEIO { class Job; }
@ -45,7 +45,7 @@ namespace TDEIO { class Job; }
#define ID_INS_OVR 2 #define ID_INS_OVR 2
#define ID_GENERAL 3 #define ID_GENERAL 3
class TopLevel : public KMainWindow class TopLevel : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -128,11 +128,11 @@ private:
bool newWindow; bool newWindow;
int statusID, toolID, indentID; int statusID, toolID, indentID;
TQTimer *statusbar_timer; TQTimer *statusbar_timer;
KRecentFilesAction *recent; TDERecentFilesAction *recent;
KAction *cutAction; TDEAction *cutAction;
KAction *copyAction; TDEAction *copyAction;
KAction *undoAction; TDEAction *undoAction;
KAction *redoAction; TDEAction *redoAction;
int open_mode; int open_mode;

16
kedit/ktextfiledlg.cpp
Unescape View File

@ -38,7 +38,7 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir,
{ {
/* /*
// insert encoding action into toolbar // insert encoding action into toolbar
KSelectAction *mEncoding = new KSelectAction( TDESelectAction *mEncoding = new TDESelectAction(
i18n( "Set &Encoding" ), 0, this, i18n( "Set &Encoding" ), 0, this,
TQT_SLOT( slotSetEncoding() ), this, TQT_SLOT( slotSetEncoding() ), this,
"encoding" ); "encoding" );
@ -57,17 +57,17 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir,
i++; i++;
} }
KToolBar *tb = toolBar(); TDEToolBar *tb = toolBar();
mEncoding->plug( tb, 7 ); mEncoding->plug( tb, 7 );
*/ */
KAction* mEncoding = new KAction( TDEAction* mEncoding = new TDEAction(
i18n("Select Encoding..."), 0, i18n("Select Encoding..."), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotShowEncCombo() ), TQT_TQOBJECT(this), "encoding"); TQT_TQOBJECT(this), TQT_SLOT( slotShowEncCombo() ), TQT_TQOBJECT(this), "encoding");
mEncoding->setIcon( TQString::fromLatin1("charset") ); mEncoding->setIcon( TQString::fromLatin1("charset") );
KToolBar *tb = toolBar(); TDEToolBar *tb = toolBar();
mEncoding->plug( tb, pathComboIndex() - 1 ); mEncoding->plug( tb, pathComboIndex() - 1 );
} }
@ -162,9 +162,9 @@ KURL KTextFileDialog::getOpenURLwithEncoding(
KURL url = dlg.selectedURL(); KURL url = dlg.selectedURL();
if (url.isValid()) { if (url.isValid()) {
if ( url.isLocalFile() ) if ( url.isLocalFile() )
KRecentDocument::add( url.path(-1) ); TDERecentDocument::add( url.path(-1) );
else else
KRecentDocument::add( url.url(-1), true ); TDERecentDocument::add( url.url(-1), true );
} }
// append encoding to the URL params // append encoding to the URL params
@ -191,9 +191,9 @@ KURL KTextFileDialog::getSaveURLwithEncoding(
KURL url = dlg.selectedURL(); KURL url = dlg.selectedURL();
if (url.isValid()) { if (url.isValid()) {
if ( url.isLocalFile() ) if ( url.isLocalFile() )
KRecentDocument::add( url.path(-1) ); TDERecentDocument::add( url.path(-1) );
else else
KRecentDocument::add( url.url(-1) ); TDERecentDocument::add( url.url(-1) );
} }
// append encoding to the URL params // append encoding to the URL params

2
kgpg/conf_servers.ui
Unescape View File

@ -67,7 +67,7 @@
<string>Delete</string> <string>Delete</string>
</property> </property>
</widget> </widget>
<widget class="KListBox" row="0" column="0" rowspan="4" colspan="1"> <widget class="TDEListBox" row="0" column="0" rowspan="4" colspan="1">
<property name="name"> <property name="name">
<cstring>ServerBox</cstring> <cstring>ServerBox</cstring>
</property> </property>

4
kgpg/groupedit.ui
Unescape View File

@ -22,7 +22,7 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<widget class="KListView" row="1" column="0" rowspan="1" colspan="4"> <widget class="TDEListView" row="1" column="0" rowspan="1" colspan="4">
<column> <column>
<property name="text"> <property name="text">
<string>Name</string> <string>Name</string>
@ -142,7 +142,7 @@
<string>&lt;b&gt;Keys in the Group&lt;/b&gt;</string> <string>&lt;b&gt;Keys in the Group&lt;/b&gt;</string>
</property> </property>
</widget> </widget>
<widget class="KListView" row="3" column="0" rowspan="1" colspan="4"> <widget class="TDEListView" row="3" column="0" rowspan="1" colspan="4">
<column> <column>
<property name="text"> <property name="text">
<string>Name</string> <string>Name</string>

4
kgpg/keyservers.cpp
Unescape View File

@ -304,7 +304,7 @@ void keyServer::slotsearchread(KProcIO *p)
keymail=TQString(); keymail=TQString();
keyname=fullname; keyname=fullname;
} }
kitem=new KListViewItem(listpop->kLVsearch,keyname,keymail,TQString(),TQString()); kitem=new TDEListViewItem(listpop->kLVsearch,keyname,keymail,TQString(),TQString());
keyNumbers++; keyNumbers++;
count=0; count=0;
required=TQString(); required=TQString();
@ -332,7 +332,7 @@ void keyServer::slotsearchread(KProcIO *p)
keymail=TQString(); keymail=TQString();
keyname=subkey; keyname=subkey;
} }
KListViewItem *subk = new KListViewItem(kitem,keyname,keymail,TQString(),TQString()); TDEListViewItem *subk = new TDEListViewItem(kitem,keyname,keymail,TQString(),TQString());
subk->setSelectable(false); subk->setSelectable(false);
} }
required=TQString(); required=TQString();

4
kgpg/keyservers.h
Unescape View File

@ -21,7 +21,7 @@
#include <kdialogbase.h> #include <kdialogbase.h>
#include "keyserver.h" #include "keyserver.h"
class KListViewItem; class TDEListViewItem;
class KSimpleConfig; class KSimpleConfig;
class KProcIO; class KProcIO;
class TDEProcess; class TDEProcess;
@ -71,7 +71,7 @@ private:
searchRes *listpop; searchRes *listpop;
int count; int count;
bool cycle,autoCloseWindow; bool cycle,autoCloseWindow;
KListViewItem *kitem; TDEListViewItem *kitem;
KDialogBase *dialogServer; KDialogBase *dialogServer;
signals: signals:

28
kgpg/kgpg.cpp
Unescape View File

@ -80,10 +80,10 @@ MyView::MyView( TQWidget *parent, const char *name )
setBackgroundMode( X11ParentRelative ); setBackgroundMode( X11ParentRelative );
openTasks=0; openTasks=0;
KAction *saveDecrypt=new KAction(i18n("&Decrypt && Save File"),"decrypted",0,TQT_TQOBJECT(this), TQT_SLOT(decryptDroppedFile()),TQT_TQOBJECT(this),"decrypt_file"); TDEAction *saveDecrypt=new TDEAction(i18n("&Decrypt && Save File"),"decrypted",0,TQT_TQOBJECT(this), TQT_SLOT(decryptDroppedFile()),TQT_TQOBJECT(this),"decrypt_file");
KAction *showDecrypt=new KAction(i18n("&Show Decrypted File"),"edit",0,TQT_TQOBJECT(this), TQT_SLOT(showDroppedFile()),TQT_TQOBJECT(this),"show_file"); TDEAction *showDecrypt=new TDEAction(i18n("&Show Decrypted File"),"edit",0,TQT_TQOBJECT(this), TQT_SLOT(showDroppedFile()),TQT_TQOBJECT(this),"show_file");
KAction *encrypt=new KAction(i18n("&Encrypt File"),"encrypted",0,TQT_TQOBJECT(this), TQT_SLOT(encryptDroppedFile()),TQT_TQOBJECT(this),"encrypt_file"); TDEAction *encrypt=new TDEAction(i18n("&Encrypt File"),"encrypted",0,TQT_TQOBJECT(this), TQT_SLOT(encryptDroppedFile()),TQT_TQOBJECT(this),"encrypt_file");
KAction *sign=new KAction(i18n("&Sign File"), "signature",0,TQT_TQOBJECT(this), TQT_SLOT(signDroppedFile()),TQT_TQOBJECT(this),"sign_file"); TDEAction *sign=new TDEAction(i18n("&Sign File"), "signature",0,TQT_TQOBJECT(this), TQT_SLOT(signDroppedFile()),TQT_TQOBJECT(this),"sign_file");
//TQToolTip::add(this,i18n("KGpg drag & drop encryption applet")); //TQToolTip::add(this,i18n("KGpg drag & drop encryption applet"));
readOptions(); readOptions();
@ -306,7 +306,7 @@ TQBoxLayout *layout=new TQBoxLayout(page,TQBoxLayout::TopToBottom,0);
layout->setAutoAdd(true); layout->setAutoAdd(true);
(void) new KActiveLabel( i18n("Do you really want to <a href=\"whatsthis:%1\">shred</a> these files?").arg(i18n( "<qt><p>You must be aware that <b>shredding is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>")),page); (void) new KActiveLabel( i18n("Do you really want to <a href=\"whatsthis:%1\">shred</a> these files?").arg(i18n( "<qt><p>You must be aware that <b>shredding is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>")),page);
KListBox *lb=new KListBox(page); TDEListBox *lb=new TDEListBox(page);
lb->insertStringList(droppedUrls.toStringList()); lb->insertStringList(droppedUrls.toStringList());
if (shredConfirm->exec()==TQDialog::Accepted) if (shredConfirm->exec()==TQDialog::Accepted)
{ {
@ -776,18 +776,18 @@ kgpgapplet::kgpgapplet(TQWidget *parent, const char *name)
{ {
w=new MyView(this); w=new MyView(this);
w->show(); w->show();
KPopupMenu *conf_menu=contextMenu(); TDEPopupMenu *conf_menu=contextMenu();
KgpgEncryptClipboard = new KAction(i18n("&Encrypt Clipboard"), "kgpg", 0,TQT_TQOBJECT(w), TQT_SLOT(clipEncrypt()),actionCollection(),"clip_encrypt"); KgpgEncryptClipboard = new TDEAction(i18n("&Encrypt Clipboard"), "kgpg", 0,TQT_TQOBJECT(w), TQT_SLOT(clipEncrypt()),actionCollection(),"clip_encrypt");
KgpgDecryptClipboard = new KAction(i18n("&Decrypt Clipboard"), 0, 0,TQT_TQOBJECT(w), TQT_SLOT(clipDecrypt()),actionCollection(),"clip_decrypt"); KgpgDecryptClipboard = new TDEAction(i18n("&Decrypt Clipboard"), 0, 0,TQT_TQOBJECT(w), TQT_SLOT(clipDecrypt()),actionCollection(),"clip_decrypt");
KgpgSignClipboard = new KAction(i18n("&Sign/Verify Clipboard"), "signature", 0,TQT_TQOBJECT(w), TQT_SLOT(clipSign()),actionCollection(),"clip_sign"); KgpgSignClipboard = new TDEAction(i18n("&Sign/Verify Clipboard"), "signature", 0,TQT_TQOBJECT(w), TQT_SLOT(clipSign()),actionCollection(),"clip_sign");
KAction *KgpgOpenEditor; TDEAction *KgpgOpenEditor;
if (KGpgSettings::leftClick()==KGpgSettings::EnumLeftClick::KeyManager) if (KGpgSettings::leftClick()==KGpgSettings::EnumLeftClick::KeyManager)
KgpgOpenEditor = new KAction(i18n("&Open Editor"), "edit", 0,TQT_TQOBJECT(parent), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor"); KgpgOpenEditor = new TDEAction(i18n("&Open Editor"), "edit", 0,TQT_TQOBJECT(parent), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor");
else else
KgpgOpenEditor = new KAction(i18n("&Open Key Manager"), "kgpg", 0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenKeyManager()),actionCollection(),"kgpg_editor"); KgpgOpenEditor = new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenKeyManager()),actionCollection(),"kgpg_editor");
KAction *KgpgOpenServer = new KAction(i18n("&Key Server Dialog"), "network", 0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenServerDialog()),actionCollection(),"kgpg_server"); TDEAction *KgpgOpenServer = new TDEAction(i18n("&Key Server Dialog"), "network", 0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenServerDialog()),actionCollection(),"kgpg_server");
KAction *KgpgPreferences=KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptions()), actionCollection()); TDEAction *KgpgPreferences=KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptions()), actionCollection());
connect (conf_menu,TQT_SIGNAL(aboutToShow()),TQT_TQOBJECT(this),TQT_SLOT(checkMenu())); connect (conf_menu,TQT_SIGNAL(aboutToShow()),TQT_TQOBJECT(this),TQT_SLOT(checkMenu()));

6
kgpg/kgpg.h
Unescape View File

@ -53,7 +53,7 @@ public:
KURL droppedUrl; KURL droppedUrl;
KURL::List droppedUrls; KURL::List droppedUrls;
KTempFile *kgpgfoldertmp; KTempFile *kgpgfoldertmp;
KShortcut goDefaultKey; TDEShortcut goDefaultKey;
TQClipboard::Mode clipboardMode; TQClipboard::Mode clipboardMode;
private: private:
@ -132,7 +132,7 @@ public:
private: private:
KSystemTray *kgpgapp; KSystemTray *kgpgapp;
KAction *KgpgEncryptClipboard, *KgpgDecryptClipboard, *KgpgSignClipboard; TDEAction *KgpgEncryptClipboard, *KgpgDecryptClipboard, *KgpgSignClipboard;
private slots: private slots:
void slotOpenKeyManager(); void slotOpenKeyManager();
@ -154,7 +154,7 @@ public:
int newInstance (); int newInstance ();
KURL::List urlList; KURL::List urlList;
bool running; bool running;
KShortcut goHome; TDEShortcut goHome;
protected: protected:
TDECmdLineArgs *args; TDECmdLineArgs *args;

20
kgpg/kgpgeditor.cpp
Unescape View File

@ -53,7 +53,7 @@
#include "listkeys.h" #include "listkeys.h"
#include "kgpglibrary.h" #include "kgpglibrary.h"
KgpgApp::KgpgApp(TQWidget *parent, const char *name, WFlags f,KShortcut goHome,bool mainWindow):KMainWindow(parent, name,f) KgpgApp::KgpgApp(TQWidget *parent, const char *name, WFlags f,TDEShortcut goHome,bool mainWindow):TDEMainWindow(parent, name,f)
{ {
isMainWindow=mainWindow; isMainWindow=mainWindow;
textEncoding=TQString(); textEncoding=TQString();
@ -94,7 +94,7 @@ void KgpgApp::closeEvent ( TQCloseEvent * e )
if (!isMainWindow) if (!isMainWindow)
{ {
kapp->ref(); kapp->ref();
KMainWindow::closeEvent( e ); TDEMainWindow::closeEvent( e );
} }
else e->accept(); else e->accept();
} }
@ -140,19 +140,19 @@ void KgpgApp::initActions()
//KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection()); //KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection());
fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection());
(void) new KAction(i18n("&Encrypt File..."), "encrypted", 0,TQT_TQOBJECT(this), TQT_SLOT(slotFilePreEnc()), actionCollection(),"file_encrypt"); (void) new TDEAction(i18n("&Encrypt File..."), "encrypted", 0,TQT_TQOBJECT(this), TQT_SLOT(slotFilePreEnc()), actionCollection(),"file_encrypt");
(void) new KAction(i18n("&Decrypt File..."), "decrypted", 0,TQT_TQOBJECT(this), TQT_SLOT(slotFilePreDec()), actionCollection(),"file_decrypt"); (void) new TDEAction(i18n("&Decrypt File..."), "decrypted", 0,TQT_TQOBJECT(this), TQT_SLOT(slotFilePreDec()), actionCollection(),"file_decrypt");
(void) new KAction(i18n("&Open Key Manager"), "kgpg", 0,TQT_TQOBJECT(this), TQT_SLOT(slotKeyManager()), actionCollection(),"key_manage"); (void) new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,TQT_TQOBJECT(this), TQT_SLOT(slotKeyManager()), actionCollection(),"key_manage");
editUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotundo()), actionCollection()); editUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotundo()), actionCollection());
editRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotredo()), actionCollection()); editRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotredo()), actionCollection());
//(void) new KAction(i18n("&Manage Keys"), "kgpg_manage", CTRL+Key_K,TQT_TQOBJECT(this), TQT_SLOT(slotManageKey()), actionCollection(),"keys_manage"); //(void) new TDEAction(i18n("&Manage Keys"), "kgpg_manage", CTRL+Key_K,TQT_TQOBJECT(this), TQT_SLOT(slotManageKey()), actionCollection(),"keys_manage");
(void) new KAction(i18n("&Generate Signature..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotPreSignFile()), actionCollection(), "sign_generate"); (void) new TDEAction(i18n("&Generate Signature..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotPreSignFile()), actionCollection(), "sign_generate");
(void) new KAction(i18n("&Verify Signature..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotPreVerifyFile()), actionCollection(), "sign_verify"); (void) new TDEAction(i18n("&Verify Signature..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotPreVerifyFile()), actionCollection(), "sign_verify");
(void) new KAction(i18n("&Check MD5 Sum..."), 0,TQT_TQOBJECT(this), TQT_SLOT(slotCheckMd5()), actionCollection(), "sign_check"); (void) new TDEAction(i18n("&Check MD5 Sum..."), 0,TQT_TQOBJECT(this), TQT_SLOT(slotCheckMd5()), actionCollection(), "sign_check");
KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection());
// comment out for now, only confusing // comment out for now, only confusing
//encodingAction=new KToggleAction(i18n("&Unicode (utf-8) Encoding"), 0, 0,this, TQT_SLOT(slotSetCharset()),actionCollection(),"charsets"); //encodingAction=new TDEToggleAction(i18n("&Unicode (utf-8) Encoding"), 0, 0,this, TQT_SLOT(slotSetCharset()),actionCollection(),"charsets");
} }
void KgpgApp::slotSetFont(TQFont myFont) void KgpgApp::slotSetFont(TQFont myFont)

14
kgpg/kgpgeditor.h
Unescape View File

@ -29,11 +29,11 @@
class KPassivePopup; class KPassivePopup;
class KComboBox; class KComboBox;
class KToggleAction; class TDEToggleAction;
class KAction; class TDEAction;
class KgpgView; class KgpgView;
class KgpgApp : public KMainWindow class KgpgApp : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -43,7 +43,7 @@ class KgpgApp : public KMainWindow
public: public:
/** construtor of KgpgApp, calls all init functions to create the application. /** construtor of KgpgApp, calls all init functions to create the application.
*/ */
KgpgApp(TQWidget *parent=0, const char *name=0,WFlags f = 0,KShortcut goHome=TQKeySequence(CTRL+TQt::Key_Home),bool mainWindow=false); KgpgApp(TQWidget *parent=0, const char *name=0,WFlags f = 0,TDEShortcut goHome=TQKeySequence(CTRL+TQt::Key_Home),bool mainWindow=false);
~KgpgApp(); ~KgpgApp();
/** opens a file specified by commandline option /** opens a file specified by commandline option
*/ */
@ -56,7 +56,7 @@ public:
int version; int version;
TQString messages; TQString messages;
KgpgView *view; KgpgView *view;
KShortcut goDefaultKey; TDEShortcut goDefaultKey;
protected: protected:
@ -105,9 +105,9 @@ public slots:
private: private:
TQStringList customDecrypt; TQStringList customDecrypt;
//KToggleAction *encodingAction ; //TDEToggleAction *encodingAction ;
KURL urlselected; KURL urlselected;
KAction* fileSave, *editUndo, *editRedo; TDEAction* fileSave, *editUndo, *editRedo;
KComboBox *fontCombo; KComboBox *fontCombo;
bool isMainWindow; bool isMainWindow;
TQString textEncoding; TQString textEncoding;

2
kgpg/kgpglibrary.cpp
Unescape View File

@ -45,7 +45,7 @@ KgpgLibrary::~KgpgLibrary()
{} {}
void KgpgLibrary::slotFileEnc(KURL::List urls,TQStringList opts,TQStringList defaultKey,KShortcut goDefaultKey) void KgpgLibrary::slotFileEnc(KURL::List urls,TQStringList opts,TQStringList defaultKey,TDEShortcut goDefaultKey)
{ {
///////////////////////////////////////////////////////////////////////// encode file file ///////////////////////////////////////////////////////////////////////// encode file file
if (!urls.empty()) { if (!urls.empty()) {

2
kgpg/kgpglibrary.h
Unescape View File

@ -43,7 +43,7 @@ public:
KURL::List urlselecteds; KURL::List urlselecteds;
public slots: public slots:
void slotFileEnc(KURL::List urls=KURL(""),TQStringList opts=TQString(),TQStringList defaultKey=TQString(),KShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home)); void slotFileEnc(KURL::List urls=KURL(""),TQStringList opts=TQString(),TQStringList defaultKey=TQString(),TDEShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home));
void slotFileDec(KURL srcUrl,KURL destUrl,TQStringList customDecryptOption=TQStringList()); void slotFileDec(KURL srcUrl,KURL destUrl,TQStringList customDecryptOption=TQStringList());
void shredprocessenc(KURL::List filesToShred); void shredprocessenc(KURL::List filesToShred);

2
kgpg/kgpgoptions.cpp
Unescape View File

@ -91,7 +91,7 @@ kdDebug(2100)<<"Adding pages"<<endl;
page6=new ServerConf(); page6=new ServerConf();
page7=new MiscConf(); page7=new MiscConf();
TQBoxLayout *fontLayout=new TQBoxLayout(page3->tabWidget3->page(1),TQBoxLayout::TopToBottom,10); TQBoxLayout *fontLayout=new TQBoxLayout(page3->tabWidget3->page(1),TQBoxLayout::TopToBottom,10);
kfc=new KFontChooser(page3->tabWidget3->page(1),"kcfg_Font",false,TQStringList(),false); kfc=new TDEFontChooser(page3->tabWidget3->page(1),"kcfg_Font",false,TQStringList(),false);
fontLayout->addWidget(kfc); fontLayout->addWidget(kfc);
page7->shredInfo->setText(i18n( "<qt><p>You must be aware that <b>shredding is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>")); page7->shredInfo->setText(i18n( "<qt><p>You must be aware that <b>shredding is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>"));

4
kgpg/kgpgoptions.h
Unescape View File

@ -32,7 +32,7 @@ class GPGConf;
class ServerConf; class ServerConf;
class ColorsConf; class ColorsConf;
class MiscConf; class MiscConf;
class KFontChooser; class TDEFontChooser;
class TDEConfig; class TDEConfig;
class KSimpleConfig; class KSimpleConfig;
@ -50,7 +50,7 @@ public:
GPGConf *page4; GPGConf *page4;
ServerConf *page6; ServerConf *page6;
MiscConf *page7; MiscConf *page7;
KFontChooser *kfc; TDEFontChooser *kfc;
private: private:
TDEConfig *config; TDEConfig *config;

124
kgpg/listkeys.cpp
Unescape View File

@ -97,9 +97,9 @@
#include "kgpgoptions.h" #include "kgpgoptions.h"
#include "keyinfowidget.h" #include "keyinfowidget.h"
////////////// KListviewItem special ////////////// TDEListviewItem special
class UpdateViewItem : public KListViewItem class UpdateViewItem : public TDEListViewItem
{ {
public: public:
UpdateViewItem(TQListView *parent, TQString name,TQString email, TQString tr, TQString val, TQString size, TQString creat, TQString id,bool isdefault,bool isexpired); UpdateViewItem(TQListView *parent, TQString name,TQString email, TQString tr, TQString val, TQString size, TQString creat, TQString id,bool isdefault,bool isexpired);
@ -111,7 +111,7 @@ public:
}; };
UpdateViewItem::UpdateViewItem(TQListView *parent, TQString name,TQString email, TQString tr, TQString val, TQString size, TQString creat, TQString id,bool isdefault,bool isexpired) UpdateViewItem::UpdateViewItem(TQListView *parent, TQString name,TQString email, TQString tr, TQString val, TQString size, TQString creat, TQString id,bool isdefault,bool isexpired)
: KListViewItem(parent) : TDEListViewItem(parent)
{ {
def=isdefault; def=isdefault;
exp=isexpired; exp=isexpired;
@ -125,7 +125,7 @@ UpdateViewItem::UpdateViewItem(TQListView *parent, TQString name,TQString email,
} }
UpdateViewItem::UpdateViewItem(TQListViewItem *parent, TQString name,TQString email, TQString tr, TQString val, TQString size, TQString creat, TQString id) UpdateViewItem::UpdateViewItem(TQListViewItem *parent, TQString name,TQString email, TQString tr, TQString val, TQString size, TQString creat, TQString id)
: KListViewItem(parent) : TDEListViewItem(parent)
{ {
setText(0,name); setText(0,name);
setText(1,email); setText(1,email);
@ -157,7 +157,7 @@ void UpdateViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,int column,
} }
KListViewItem::paintCell(p,_cg, column, width, alignment); TDEListViewItem::paintCell(p,_cg, column, width, alignment);
} }
#include <iostream> #include <iostream>
@ -223,7 +223,7 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel)
keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20); keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20);
setMinimumSize(350,100); setMinimumSize(350,100);
keysListpr = new KListView( page ); keysListpr = new TDEListView( page );
keysListpr->setRootIsDecorated(true); keysListpr->setRootIsDecorated(true);
keysListpr->addColumn( i18n( "Name" )); keysListpr->addColumn( i18n( "Name" ));
keysListpr->addColumn( i18n( "Email" )); keysListpr->addColumn( i18n( "Email" ));
@ -244,7 +244,7 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel)
bool selectedok=false; bool selectedok=false;
bool warn=false; bool warn=false;
KListViewItem *item; TDEListViewItem *item;
fp = popen("gpg --no-tty --with-colons --list-secret-keys", "r"); fp = popen("gpg --no-tty --with-colons --list-secret-keys", "r");
while ( fgets( line, sizeof(line), fp)) { while ( fgets( line, sizeof(line), fp)) {
@ -296,9 +296,9 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel)
keyName=KgpgInterface::checkForUtf8(keyName); keyName=KgpgInterface::checkForUtf8(keyName);
item=new KListViewItem(keysListpr,keyName,keyMail,id); item=new TDEListViewItem(keysListpr,keyName,keyMail,id);
//KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").arg(id).arg(trust).arg(val)); //TDEListViewItem *sub= new TDEListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").arg(id).arg(trust).arg(val));
KListViewItem *sub= new KListViewItem(item,i18n("Expiration:"),val); TDEListViewItem *sub= new TDEListViewItem(item,i18n("Expiration:"),val);
sub->setSelectable(false); sub->setSelectable(false);
item->setPixmap(0,keyPair); item->setPixmap(0,keyPair);
if (preselected.find(id,0,false)!=-1) { if (preselected.find(id,0,false)!=-1) {
@ -393,7 +393,7 @@ TQString KgpgSelKey::getkeyMail()
///////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////
KeyView::KeyView( TQWidget *parent, const char *name ) KeyView::KeyView( TQWidget *parent, const char *name )
: KListView( parent, name ) : TDEListView( parent, name )
{ {
KIconLoader *loader = TDEGlobal::iconLoader(); KIconLoader *loader = TDEGlobal::iconLoader();
@ -477,7 +477,7 @@ void KeyView::startDrag()
mySearchLine::mySearchLine(TQWidget *parent, KeyView *listView, const char *name) mySearchLine::mySearchLine(TQWidget *parent, KeyView *listView, const char *name)
:KListViewSearchLine(parent,listView,name) :TDEListViewSearchLine(parent,listView,name)
{ {
searchListView=listView; searchListView=listView;
setKeepParentsVisible(false); setKeepParentsVisible(false);
@ -490,14 +490,14 @@ mySearchLine::~ mySearchLine()
bool mySearchLine::itemMatches(const TQListViewItem *item, const TQString & s) const bool mySearchLine::itemMatches(const TQListViewItem *item, const TQString & s) const
{ {
if (item->depth()!=0) return true; if (item->depth()!=0) return true;
else return KListViewSearchLine::itemMatches(item,s); else return TDEListViewSearchLine::itemMatches(item,s);
} }
void mySearchLine::updateSearch(const TQString& s) void mySearchLine::updateSearch(const TQString& s)
{ {
KListViewSearchLine::updateSearch(s); TDEListViewSearchLine::updateSearch(s);
if (searchListView->displayOnlySecret || !searchListView->displayDisabled) if (searchListView->displayOnlySecret || !searchListView->displayDisabled)
{ {
int disabledSerial=searchListView->trustbad.serialNumber(); int disabledSerial=searchListView->trustbad.serialNumber();
@ -519,7 +519,7 @@ void mySearchLine::updateSearch(const TQString& s)
/////////////////////////////////////////////////////////////////////////////////////// main window for key management /////////////////////////////////////////////////////////////////////////////////////// main window for key management
listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterface" ), KMainWindow(parent, name,0) listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterface" ), TDEMainWindow(parent, name,0)
{ {
//KWin::setType(TQt::WDestructiveClose); //KWin::setType(TQt::WDestructiveClose);
@ -533,63 +533,63 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa
installEventFilter(this); installEventFilter(this);
setCaption(i18n("Key Management")); setCaption(i18n("Key Management"));
(void) new KAction(i18n("&Open Editor"), "edit",0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor"); (void) new TDEAction(i18n("&Open Editor"), "edit",0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor");
KAction *exportPublicKey = new KAction(i18n("E&xport Public Keys..."), "kgpg_export", KStdAccel::shortcut(KStdAccel::Copy),TQT_TQOBJECT(this), TQT_SLOT(slotexport()),actionCollection(),"key_export"); TDEAction *exportPublicKey = new TDEAction(i18n("E&xport Public Keys..."), "kgpg_export", TDEStdAccel::shortcut(TDEStdAccel::Copy),TQT_TQOBJECT(this), TQT_SLOT(slotexport()),actionCollection(),"key_export");
KAction *deleteKey = new KAction(i18n("&Delete Keys"),"editdelete", TQt::Key_Delete,TQT_TQOBJECT(this), TQT_SLOT(confirmdeletekey()),actionCollection(),"key_delete"); TDEAction *deleteKey = new TDEAction(i18n("&Delete Keys"),"editdelete", TQt::Key_Delete,TQT_TQOBJECT(this), TQT_SLOT(confirmdeletekey()),actionCollection(),"key_delete");
signKey = new KAction(i18n("&Sign Keys..."), "kgpg_sign", 0,TQT_TQOBJECT(this), TQT_SLOT(signkey()),actionCollection(),"key_sign"); signKey = new TDEAction(i18n("&Sign Keys..."), "kgpg_sign", 0,TQT_TQOBJECT(this), TQT_SLOT(signkey()),actionCollection(),"key_sign");
KAction *delSignKey = new KAction(i18n("Delete Sign&ature"),"editdelete", 0,TQT_TQOBJECT(this), TQT_SLOT(delsignkey()),actionCollection(),"key_delsign"); TDEAction *delSignKey = new TDEAction(i18n("Delete Sign&ature"),"editdelete", 0,TQT_TQOBJECT(this), TQT_SLOT(delsignkey()),actionCollection(),"key_delsign");
KAction *infoKey = new KAction(i18n("&Edit Key"), "kgpg_info", TQt::Key_Return,TQT_TQOBJECT(this), TQT_SLOT(listsigns()),actionCollection(),"key_info"); TDEAction *infoKey = new TDEAction(i18n("&Edit Key"), "kgpg_info", TQt::Key_Return,TQT_TQOBJECT(this), TQT_SLOT(listsigns()),actionCollection(),"key_info");
KAction *importKey = new KAction(i18n("&Import Key..."), "kgpg_import", KStdAccel::shortcut(KStdAccel::Paste),TQT_TQOBJECT(this), TQT_SLOT(slotPreImportKey()),actionCollection(),"key_import"); TDEAction *importKey = new TDEAction(i18n("&Import Key..."), "kgpg_import", TDEStdAccel::shortcut(TDEStdAccel::Paste),TQT_TQOBJECT(this), TQT_SLOT(slotPreImportKey()),actionCollection(),"key_import");
KAction *setDefaultKey = new KAction(i18n("Set as De&fault Key"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotSetDefKey()),actionCollection(),"key_default"); TDEAction *setDefaultKey = new TDEAction(i18n("Set as De&fault Key"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotSetDefKey()),actionCollection(),"key_default");
importSignatureKey = new KAction(i18n("Import Key From Keyserver"),"network", 0,TQT_TQOBJECT(this), TQT_SLOT(preimportsignkey()),actionCollection(),"key_importsign"); importSignatureKey = new TDEAction(i18n("Import Key From Keyserver"),"network", 0,TQT_TQOBJECT(this), TQT_SLOT(preimportsignkey()),actionCollection(),"key_importsign");
importAllSignKeys = new KAction(i18n("Import &Missing Signatures From Keyserver"),"network", 0,TQT_TQOBJECT(this), TQT_SLOT(importallsignkey()),actionCollection(),"key_importallsign"); importAllSignKeys = new TDEAction(i18n("Import &Missing Signatures From Keyserver"),"network", 0,TQT_TQOBJECT(this), TQT_SLOT(importallsignkey()),actionCollection(),"key_importallsign");
refreshKey = new KAction(i18n("&Refresh Keys From Keyserver"),"reload", 0,TQT_TQOBJECT(this), TQT_SLOT(refreshKeyFromServer()),actionCollection(),"key_server_refresh"); refreshKey = new TDEAction(i18n("&Refresh Keys From Keyserver"),"reload", 0,TQT_TQOBJECT(this), TQT_SLOT(refreshKeyFromServer()),actionCollection(),"key_server_refresh");
KAction *createGroup=new KAction(i18n("&Create Group with Selected Keys..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(createNewGroup()),actionCollection(),"create_group"); TDEAction *createGroup=new TDEAction(i18n("&Create Group with Selected Keys..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(createNewGroup()),actionCollection(),"create_group");
KAction *delGroup= new KAction(i18n("&Delete Group"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(deleteGroup()),actionCollection(),"delete_group"); TDEAction *delGroup= new TDEAction(i18n("&Delete Group"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(deleteGroup()),actionCollection(),"delete_group");
KAction *editCurrentGroup= new KAction(i18n("&Edit Group"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(editGroup()),actionCollection(),"edit_group"); TDEAction *editCurrentGroup= new TDEAction(i18n("&Edit Group"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(editGroup()),actionCollection(),"edit_group");
KAction *newContact=new KAction(i18n("&Create New Contact in Address Book"), "kaddressbook", 0,TQT_TQOBJECT(this), TQT_SLOT(addToKAB()),actionCollection(),"add_kab"); TDEAction *newContact=new TDEAction(i18n("&Create New Contact in Address Book"), "kaddressbook", 0,TQT_TQOBJECT(this), TQT_SLOT(addToKAB()),actionCollection(),"add_kab");
(void) new KAction(i18n("&Go to Default Key"), "gohome",TQKeySequence(CTRL+TQt::Key_Home) ,TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actionCollection(),"go_default_key"); (void) new TDEAction(i18n("&Go to Default Key"), "gohome",TQKeySequence(CTRL+TQt::Key_Home) ,TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actionCollection(),"go_default_key");
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitApp()), actionCollection()); KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitApp()), actionCollection());
KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(findKey()), actionCollection()); KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(findKey()), actionCollection());
KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(findNextKey()), actionCollection()); KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(findNextKey()), actionCollection());
(void) new KAction(i18n("&Refresh List"), "reload", KStdAccel::reload(),TQT_TQOBJECT(this), TQT_SLOT(refreshkey()),actionCollection(),"key_refresh"); (void) new TDEAction(i18n("&Refresh List"), "reload", TDEStdAccel::reload(),TQT_TQOBJECT(this), TQT_SLOT(refreshkey()),actionCollection(),"key_refresh");
KAction *openPhoto= new KAction(i18n("&Open Photo"), "image", 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowPhoto()),actionCollection(),"key_photo"); TDEAction *openPhoto= new TDEAction(i18n("&Open Photo"), "image", 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowPhoto()),actionCollection(),"key_photo");
KAction *deletePhoto= new KAction(i18n("&Delete Photo"), "delete", 0,TQT_TQOBJECT(this), TQT_SLOT(slotDeletePhoto()),actionCollection(),"delete_photo"); TDEAction *deletePhoto= new TDEAction(i18n("&Delete Photo"), "delete", 0,TQT_TQOBJECT(this), TQT_SLOT(slotDeletePhoto()),actionCollection(),"delete_photo");
KAction *addPhoto= new KAction(i18n("&Add Photo"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotAddPhoto()),actionCollection(),"add_photo"); TDEAction *addPhoto= new TDEAction(i18n("&Add Photo"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotAddPhoto()),actionCollection(),"add_photo");
KAction *addUid= new KAction(i18n("&Add User Id"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotAddUid()),actionCollection(),"add_uid"); TDEAction *addUid= new TDEAction(i18n("&Add User Id"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotAddUid()),actionCollection(),"add_uid");
KAction *delUid= new KAction(i18n("&Delete User Id"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotDelUid()),actionCollection(),"del_uid"); TDEAction *delUid= new TDEAction(i18n("&Delete User Id"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotDelUid()),actionCollection(),"del_uid");
KAction *editKey = new KAction(i18n("Edit Key in &Terminal"), "kgpg_term", TQKeySequence(ALT+TQt::Key_Return),TQT_TQOBJECT(this), TQT_SLOT(slotedit()),actionCollection(),"key_edit"); TDEAction *editKey = new TDEAction(i18n("Edit Key in &Terminal"), "kgpg_term", TQKeySequence(ALT+TQt::Key_Return),TQT_TQOBJECT(this), TQT_SLOT(slotedit()),actionCollection(),"key_edit");
KAction *exportSecretKey = new KAction(i18n("Export Secret Key..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotexportsec()),actionCollection(),"key_sexport"); TDEAction *exportSecretKey = new TDEAction(i18n("Export Secret Key..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotexportsec()),actionCollection(),"key_sexport");
KAction *revokeKey = new KAction(i18n("Revoke Key..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(revokeWidget()),actionCollection(),"key_revoke"); TDEAction *revokeKey = new TDEAction(i18n("Revoke Key..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(revokeWidget()),actionCollection(),"key_revoke");
KAction *deleteKeyPair = new KAction(i18n("Delete Key Pair"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(deleteseckey()),actionCollection(),"key_pdelete"); TDEAction *deleteKeyPair = new TDEAction(i18n("Delete Key Pair"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(deleteseckey()),actionCollection(),"key_pdelete");
KAction *generateKey = new KAction(i18n("&Generate Key Pair..."), "kgpg_gen", KStdAccel::shortcut(KStdAccel::New),TQT_TQOBJECT(this), TQT_SLOT(slotgenkey()),actionCollection(),"key_gener"); TDEAction *generateKey = new TDEAction(i18n("&Generate Key Pair..."), "kgpg_gen", TDEStdAccel::shortcut(TDEStdAccel::New),TQT_TQOBJECT(this), TQT_SLOT(slotgenkey()),actionCollection(),"key_gener");
KAction *regeneratePublic = new KAction(i18n("&Regenerate Public Key"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotregenerate()),actionCollection(),"key_regener"); TDEAction *regeneratePublic = new TDEAction(i18n("&Regenerate Public Key"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotregenerate()),actionCollection(),"key_regener");
(void) new KAction(i18n("&Key Server Dialog"), "network", 0,TQT_TQOBJECT(this), TQT_SLOT(showKeyServer()),actionCollection(),"key_server"); (void) new TDEAction(i18n("&Key Server Dialog"), "network", 0,TQT_TQOBJECT(this), TQT_SLOT(showKeyServer()),actionCollection(),"key_server");
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptions()), actionCollection(),"options_configure"); KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptions()), actionCollection(),"options_configure");
(void) new KAction(i18n("Tip of the &Day"), "idea", 0,TQT_TQOBJECT(this), TQT_SLOT(slotTip()), actionCollection(),"help_tipofday"); (void) new TDEAction(i18n("Tip of the &Day"), "idea", 0,TQT_TQOBJECT(this), TQT_SLOT(slotTip()), actionCollection(),"help_tipofday");
(void) new KAction(i18n("View GnuPG Manual"), "contents", 0,TQT_TQOBJECT(this), TQT_SLOT(slotManpage()),actionCollection(),"gpg_man"); (void) new TDEAction(i18n("View GnuPG Manual"), "contents", 0,TQT_TQOBJECT(this), TQT_SLOT(slotManpage()),actionCollection(),"gpg_man");
(void) new KToggleAction(i18n("&Show only Secret Keys"), "kgpg_show", 0,TQT_TQOBJECT(this), TQT_SLOT(slotToggleSecret()),actionCollection(),"show_secret"); (void) new TDEToggleAction(i18n("&Show only Secret Keys"), "kgpg_show", 0,TQT_TQOBJECT(this), TQT_SLOT(slotToggleSecret()),actionCollection(),"show_secret");
keysList2->displayOnlySecret=false; keysList2->displayOnlySecret=false;
(void) new KToggleAction(i18n("&Hide Expired/Disabled Keys"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotToggleDisabled()),actionCollection(),"hide_disabled"); (void) new TDEToggleAction(i18n("&Hide Expired/Disabled Keys"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotToggleDisabled()),actionCollection(),"hide_disabled");
keysList2->displayDisabled=true; keysList2->displayDisabled=true;
sTrust=new KToggleAction(i18n("Trust"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowTrust()),actionCollection(),"show_trust"); sTrust=new TDEToggleAction(i18n("Trust"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowTrust()),actionCollection(),"show_trust");
sSize=new KToggleAction(i18n("Size"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowSize()),actionCollection(),"show_size"); sSize=new TDEToggleAction(i18n("Size"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowSize()),actionCollection(),"show_size");
sCreat=new KToggleAction(i18n("Creation"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowCreat()),actionCollection(),"show_creat"); sCreat=new TDEToggleAction(i18n("Creation"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowCreat()),actionCollection(),"show_creat");
sExpi=new KToggleAction(i18n("Expiration"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowExpi()),actionCollection(),"show_expi"); sExpi=new TDEToggleAction(i18n("Expiration"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowExpi()),actionCollection(),"show_expi");
photoProps = new KSelectAction(i18n("&Photo ID's"),"kgpg_photo", actionCollection(), "photo_settings"); photoProps = new TDESelectAction(i18n("&Photo ID's"),"kgpg_photo", actionCollection(), "photo_settings");
connect(photoProps, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetPhotoSize(int))); connect(photoProps, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetPhotoSize(int)));
// Keep the list in kgpg.kcfg in sync with this one! // Keep the list in kgpg.kcfg in sync with this one!
@ -616,7 +616,7 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa
keysList2->setAllColumnsShowFocus(true); keysList2->setAllColumnsShowFocus(true);
keysList2->setFullWidth(true); keysList2->setFullWidth(true);
keysList2->setAcceptDrops (true) ; keysList2->setAcceptDrops (true) ;
keysList2->setSelectionModeExt(KListView::Extended); keysList2->setSelectionModeExt(TDEListView::Extended);
popup=new TQPopupMenu(); popup=new TQPopupMenu();
@ -693,7 +693,7 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa
/////////////// get all keys data /////////////// get all keys data
keyStatusBar=statusBar(); keyStatusBar=statusBar();
setupGUI(KMainWindow::Create | Save | ToolBar | StatusBar | Keys, "listkeys.rc"); setupGUI(TDEMainWindow::Create | Save | ToolBar | StatusBar | Keys, "listkeys.rc");
toolBar()->insertLineSeparator(); toolBar()->insertLineSeparator();
TQToolButton *clearSearch = new TQToolButton(toolBar()); TQToolButton *clearSearch = new TQToolButton(toolBar());
@ -705,7 +705,7 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa
connect(clearSearch, TQT_SIGNAL(pressed()), TQT_TQOBJECT(listViewSearch), TQT_SLOT(clear())); connect(clearSearch, TQT_SIGNAL(pressed()), TQT_TQOBJECT(listViewSearch), TQT_SLOT(clear()));
(void)new KAction(i18n("Filter Search"), TQt::Key_F6, TQT_TQOBJECT(listViewSearch), TQT_SLOT(setFocus()),actionCollection(), "search_focus"); (void)new TDEAction(i18n("Filter Search"), TQt::Key_F6, TQT_TQOBJECT(listViewSearch), TQT_SLOT(setFocus()),actionCollection(), "search_focus");
sTrust->setChecked(KGpgSettings::showTrust()); sTrust->setChecked(KGpgSettings::showTrust());
sSize->setChecked(KGpgSettings::showSize()); sSize->setChecked(KGpgSettings::showSize());
@ -1191,8 +1191,8 @@ void listKeys::slotTip()
void listKeys::closeEvent ( TQCloseEvent * e ) void listKeys::closeEvent ( TQCloseEvent * e )
{ {
//kapp->ref(); // prevent KMainWindow from closing the app //kapp->ref(); // prevent TDEMainWindow from closing the app
//KMainWindow::closeEvent( e ); //TDEMainWindow::closeEvent( e );
e->accept(); e->accept();
// hide(); // hide();
// e->ignore(); // e->ignore();
@ -1791,13 +1791,13 @@ void listKeys::editGroup()
return; return;
if (item->pixmap(2)) { if (item->pixmap(2)) {
if (item->pixmap(2)->serialNumber()==keysList2->trustgood.serialNumber()) if (item->pixmap(2)->serialNumber()==keysList2->trustgood.serialNumber())
(void) new KListViewItem(gEdit->availableKeys,item->text(0),item->text(1),item->text(6)); (void) new TDEListViewItem(gEdit->availableKeys,item->text(0),item->text(1),item->text(6));
} }
while (item->nextSibling()) { while (item->nextSibling()) {
item=item->nextSibling(); item=item->nextSibling();
if (item->pixmap(2)) { if (item->pixmap(2)) {
if (item->pixmap(2)->serialNumber()==keysList2->trustgood.serialNumber()) if (item->pixmap(2)->serialNumber()==keysList2->trustgood.serialNumber())
(void) new KListViewItem(gEdit->availableKeys,item->text(0),item->text(1),item->text(6)); (void) new TDEListViewItem(gEdit->availableKeys,item->text(0),item->text(1),item->text(6));
} }
} }
keysGroup=KgpgInterface::getGpgGroupSetting(keysList2->currentItem()->text(0),KGpgSettings::gpgConfigPath()); keysGroup=KgpgInterface::getGpgGroupSetting(keysList2->currentItem()->text(0),KGpgSettings::gpgConfigPath());

18
kgpg/listkeys.h
Unescape View File

@ -49,7 +49,7 @@ class KgpgApp;
class keyServer; class keyServer;
class groupEdit; class groupEdit;
class KgpgInterface; class KgpgInterface;
class KSelectAction; class TDESelectAction;
struct gpgKey struct gpgKey
{ {
@ -72,7 +72,7 @@ class KgpgSelKey : public KDialogBase
public: public:
KgpgSelKey( TQWidget *parent = 0, const char *name = 0,bool allowMultipleSelection=false, TQString preselected=TQString()); KgpgSelKey( TQWidget *parent = 0, const char *name = 0,bool allowMultipleSelection=false, TQString preselected=TQString());
KListView *keysListpr; TDEListView *keysListpr;
TQPixmap keyPair; TQPixmap keyPair;
TQCheckBox *local; TQCheckBox *local;
TQVBoxLayout *vbox; TQVBoxLayout *vbox;
@ -89,7 +89,7 @@ public slots:
class KeyView : public KListView class KeyView : public TDEListView
{ {
Q_OBJECT Q_OBJECT
@ -141,7 +141,7 @@ protected:
virtual void contentsDropEvent (TQDropEvent*); virtual void contentsDropEvent (TQDropEvent*);
}; };
class mySearchLine: public KListViewSearchLine class mySearchLine: public TDEListViewSearchLine
{ {
Q_OBJECT Q_OBJECT
@ -158,7 +158,7 @@ virtual bool itemMatches(const TQListViewItem *item, const TQString & s) const;
}; };
class listKeys : public KMainWindow, virtual public KeyInterface class listKeys : public TDEMainWindow, virtual public KeyInterface
{ {
friend class KeyView; friend class KeyView;
Q_OBJECT Q_OBJECT
@ -173,20 +173,20 @@ public:
TQString message; TQString message;
TQStringList keynames; TQStringList keynames;
KPassivePopup *pop; KPassivePopup *pop;
KToggleAction *sTrust,*sCreat,*sExpi,*sSize; TDEToggleAction *sTrust,*sCreat,*sExpi,*sSize;
KSelectAction *photoProps; TDESelectAction *photoProps;
KStatusBar *keyStatusBar; KStatusBar *keyStatusBar;
KgpgApp *s_kgpgEditor; KgpgApp *s_kgpgEditor;
private: private:
TQPushButton *bouton1,*bouton2,*bouton0; TQPushButton *bouton1,*bouton2,*bouton0;
TQString tempKeyFile,newKeyMail,newKeyName,newkeyFinger,newkeyID; TQString tempKeyFile,newKeyMail,newKeyName,newkeyFinger,newkeyID;
KListViewSearchLine* listViewSearch; TDEListViewSearchLine* listViewSearch;
bool continueSearch; bool continueSearch;
bool showPhoto; bool showPhoto;
keyServer *kServer; keyServer *kServer;
KTempFile *kgpgtmp; KTempFile *kgpgtmp;
KAction *importSignatureKey,*importAllSignKeys,*signKey,*refreshKey; TDEAction *importSignatureKey,*importAllSignKeys,*signKey,*refreshKey;
TQPtrList<TQListViewItem> signList,keysList; TQPtrList<TQListViewItem> signList,keysList;
uint globalCount,keyCount; uint globalCount,keyCount;
int globalChecked; int globalChecked;

20
kgpg/popuppublic.cpp
Unescape View File

@ -51,7 +51,7 @@
///////////////// klistviewitem special ///////////////// klistviewitem special
class UpdateViewItem2 : public KListViewItem class UpdateViewItem2 : public TDEListViewItem
{ {
public: public:
UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault); UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault);
@ -61,7 +61,7 @@ public:
}; };
UpdateViewItem2::UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault) UpdateViewItem2::UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault)
: KListViewItem(parent) : TDEListViewItem(parent)
{ {
def=isDefault; def=isDefault;
setText(0,name); setText(0,name);
@ -77,7 +77,7 @@ void UpdateViewItem2::paintCell(TQPainter *p, const TQColorGroup &cg,int column,
font.setBold(true); font.setBold(true);
p->setFont(font); p->setFont(font);
} }
KListViewItem::paintCell(p, cg, column, width, alignment); TDEListViewItem::paintCell(p, cg, column, width, alignment);
} }
TQString UpdateViewItem2 :: key(int c,bool ) const TQString UpdateViewItem2 :: key(int c,bool ) const
@ -87,7 +87,7 @@ TQString UpdateViewItem2 :: key(int c,bool ) const
/////////////// main view /////////////// main view
popupPublic::popupPublic(TQWidget *parent, const char *name,TQString sfile,bool filemode,KShortcut goDefaultKey): popupPublic::popupPublic(TQWidget *parent, const char *name,TQString sfile,bool filemode,TDEShortcut goDefaultKey):
KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent, name,true) KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent, name,true)
{ {
@ -119,11 +119,11 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
clearSearch->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" clearSearch->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left"
: "locationbar_erase")); : "locationbar_erase"));
(void) new TQLabel(i18n("Search: "),hBar); (void) new TQLabel(i18n("Search: "),hBar);
KListViewSearchLine* listViewSearch = new KListViewSearchLine(hBar); TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(hBar);
connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear()));
#endif #endif
keysList = new KListView( page ); keysList = new TDEListView( page );
keysList->addColumn(i18n("Name")); keysList->addColumn(i18n("Name"));
keysList->addColumn(i18n("Email")); keysList->addColumn(i18n("Email"));
keysList->addColumn(i18n("ID")); keysList->addColumn(i18n("ID"));
@ -137,7 +137,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
keysList->setShowSortIndicator(true); keysList->setShowSortIndicator(true);
keysList->setFullWidth(true); keysList->setFullWidth(true);
keysList->setAllColumnsShowFocus(true); keysList->setAllColumnsShowFocus(true);
keysList->setSelectionModeExt(KListView::Extended); keysList->setSelectionModeExt(TDEListView::Extended);
keysList->setColumnWidthMode(0,TQListView::Manual); keysList->setColumnWidthMode(0,TQListView::Manual);
keysList->setColumnWidthMode(1,TQListView::Manual); keysList->setColumnWidthMode(1,TQListView::Manual);
keysList->setColumnWidth(0,210); keysList->setColumnWidth(0,210);
@ -145,8 +145,8 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
boutonboxoptions=new TQButtonGroup(5,Qt::Vertical ,page,0); boutonboxoptions=new TQButtonGroup(5,Qt::Vertical ,page,0);
KActionCollection *actcol=new KActionCollection(this); TDEActionCollection *actcol=new TDEActionCollection(this);
(void) new KAction(i18n("&Go to Default Key"),goDefaultKey, TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key"); (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key");
CBarmor=new TQCheckBox(i18n("ASCII armored encryption"),boutonboxoptions); CBarmor=new TQCheckBox(i18n("ASCII armored encryption"),boutonboxoptions);
@ -431,7 +431,7 @@ void popupPublic::slotprocread(KProcIO *p)
bool isDefaultKey=false; bool isDefaultKey=false;
if (id.right(8)==defaultKey) isDefaultKey=true; if (id.right(8)==defaultKey) isDefaultKey=true;
UpdateViewItem2 *item=new UpdateViewItem2(keysList,keyname,keymail,id,isDefaultKey); UpdateViewItem2 *item=new UpdateViewItem2(keysList,keyname,keymail,id,isDefaultKey);
//KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").arg(id).arg(tr).arg(val)); //TDEListViewItem *sub= new TDEListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").arg(id).arg(tr).arg(val));
//sub->setSelectable(false); //sub->setSelectable(false);
if (seclist.find(tst,0,FALSE)!=-1) if (seclist.find(tst,0,FALSE)!=-1)
item->setPixmap(0,keyPair); item->setPixmap(0,keyPair);

6
kgpg/popuppublic.h
Unescape View File

@ -25,7 +25,7 @@
class TQPushButton; class TQPushButton;
class TQCheckBox; class TQCheckBox;
class KListView; class TDEListView;
class TQButtonGroup; class TQButtonGroup;
class KProcIO; class KProcIO;
@ -35,9 +35,9 @@ class popupPublic : public KDialogBase //TQDialog
public: public:
popupPublic(TQWidget *parent=0, const char *name=0,TQString sfile="",bool filemode=false,KShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home)); popupPublic(TQWidget *parent=0, const char *name=0,TQString sfile="",bool filemode=false,TDEShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home));
~popupPublic(); ~popupPublic();
KListView *keysList; TDEListView *keysList;
TQCheckBox *CBarmor,*CBuntrusted,*CBshred,*CBsymmetric,*CBhideid; TQCheckBox *CBarmor,*CBuntrusted,*CBshred,*CBsymmetric,*CBhideid;
bool fmode,trusted; bool fmode,trusted;
TQPixmap keyPair,keySingle,keyGroup; TQPixmap keyPair,keySingle,keyGroup;

2
kgpg/searchres.ui
Unescape View File

@ -40,7 +40,7 @@
<cstring>kLEID</cstring> <cstring>kLEID</cstring>
</property> </property>
</widget> </widget>
<widget class="KListView" row="1" column="0" rowspan="1" colspan="2"> <widget class="TDEListView" row="1" column="0" rowspan="1" colspan="2">
<column> <column>
<property name="text"> <property name="text">
<string>Name</string> <string>Name</string>

2
khexedit/hexviewwidget.cc
Unescape View File

@ -1091,7 +1091,7 @@ int CHexViewWidget::bookmarkMenu( const TQString &title )
} }
TQString text; TQString text;
KPopupMenu *popup = new KPopupMenu( 0 ); TDEPopupMenu *popup = new TDEPopupMenu( 0 );
popup->insertTitle( title ); popup->insertTitle( title );
for( uint i=0; i < list.count(); i++ ) for( uint i=0; i < list.count(); i++ )
{ {

2
khexedit/lib/kbufferranges.h
Unescape View File

@ -96,7 +96,7 @@ class TDEBufferRanges
bool Modified; bool Modified;
KSection Marking; KSection Marking;
KSelection Selection; TDESelection Selection;
/** memories first selected word on wordwise selection */ /** memories first selected word on wordwise selection */
KSection FirstWordSelection; KSection FirstWordSelection;

42
khexedit/lib/kselection.h
Unescape View File

@ -34,20 +34,20 @@ namespace KHE
* *
*@author Friedrich W. H. Kossebau *@author Friedrich W. H. Kossebau
*/ */
class KSelection : public KSection class TDESelection : public KSection
{ {
public: public:
/** creates a selection with a given start. /** creates a selection with a given start.
* @param Index index in front of which the selection begins * @param Index index in front of which the selection begins
*/ */
KSelection( int Index ); TDESelection( int Index );
/** creates an invalid selection */ /** creates an invalid selection */
KSelection(); TDESelection();
~KSelection(); ~TDESelection();
public: public:
KSelection &operator=( const KSelection &S ); TDESelection &operator=( const TDESelection &S );
KSelection &operator=( const KSection &S ); TDESelection &operator=( const KSection &S );
public: // modification access public: // modification access
/** starts the selection. /** starts the selection.
@ -103,18 +103,18 @@ class KSelection : public KSection
}; };
inline KSelection::KSelection() : Anchor( -1 ) {} inline TDESelection::TDESelection() : Anchor( -1 ) {}
inline KSelection::KSelection( int Index ) : Anchor( Index ) {} inline TDESelection::TDESelection( int Index ) : Anchor( Index ) {}
inline KSelection::~KSelection() {} inline TDESelection::~TDESelection() {}
inline KSelection &KSelection::operator=( const KSelection &S ) inline TDESelection &TDESelection::operator=( const TDESelection &S )
{ {
KSection::operator=(S); KSection::operator=(S);
Anchor = S.Anchor; Anchor = S.Anchor;
return *this; return *this;
} }
inline KSelection &KSelection::operator=( const KSection &S ) inline TDESelection &TDESelection::operator=( const KSection &S )
{ {
KSection::operator=(S); KSection::operator=(S);
Anchor = start(); Anchor = start();
@ -122,14 +122,14 @@ inline KSelection &KSelection::operator=( const KSection &S )
} }
inline void KSelection::setStart( int Index ) inline void TDESelection::setStart( int Index )
{ {
Anchor = Index; Anchor = Index;
unset(); unset();
} }
inline void KSelection::setEnd( int Index ) inline void TDESelection::setEnd( int Index )
{ {
// nothing selected? // nothing selected?
if( Index == Anchor ) if( Index == Anchor )
@ -148,30 +148,30 @@ inline void KSelection::setEnd( int Index )
} }
} }
inline void KSelection::reverse() inline void TDESelection::reverse()
{ {
Anchor = isForward() ? end()+1 : start(); Anchor = isForward() ? end()+1 : start();
} }
inline void KSelection::setForward() inline void TDESelection::setForward()
{ {
Anchor = start(); Anchor = start();
} }
inline void KSelection::setBackward() inline void TDESelection::setBackward()
{ {
Anchor = end()+1; Anchor = end()+1;
} }
inline int KSelection::anchor() const { return Anchor; } inline int TDESelection::anchor() const { return Anchor; }
inline void KSelection::cancel() { Anchor = -1; unset(); } inline void TDESelection::cancel() { Anchor = -1; unset(); }
inline bool KSelection::started() const { return Anchor != -1; } inline bool TDESelection::started() const { return Anchor != -1; }
inline bool KSelection::justStarted() const { return Anchor != -1 && start() == -1; } inline bool TDESelection::justStarted() const { return Anchor != -1 && start() == -1; }
inline bool KSelection::isForward() const { return Anchor == start(); } inline bool TDESelection::isForward() const { return Anchor == start(); }
} }

2
khexedit/listview.cc
Unescape View File

@ -25,7 +25,7 @@
CListView::CListView( TQWidget *parent, const char *name, int visibleItem ) CListView::CListView( TQWidget *parent, const char *name, int visibleItem )
:KListView( parent, name ), mVisibleItem(TQMAX( 1, visibleItem )) :TDEListView( parent, name ), mVisibleItem(TQMAX( 1, visibleItem ))
{ {
setVisibleItem(visibleItem); setVisibleItem(visibleItem);
} }

2
khexedit/listview.h
Unescape View File

@ -23,7 +23,7 @@
#include <klistview.h> #include <klistview.h>
class CListView : public KListView class CListView : public TDEListView
{ {
Q_OBJECT Q_OBJECT

6
khexedit/optiondialog.cc
Unescape View File

@ -33,7 +33,7 @@
#include <kcolordialog.h> #include <kcolordialog.h>
#include <kcolordrag.h> #include <kcolordrag.h>
#include <kfontdialog.h> // For KFontChooser #include <kfontdialog.h> // For TDEFontChooser
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
@ -390,7 +390,7 @@ void COptionDialog::setupFontPage( void )
hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine );
topLayout->addWidget( hline ); topLayout->addWidget( hline );
mFont.chooser = new KFontChooser( page, "font", true, TQStringList(), false, 4 ); mFont.chooser = new TDEFontChooser( page, "font", true, TQStringList(), false, 4 );
topLayout->addWidget( mFont.chooser ); topLayout->addWidget( mFont.chooser );
TQFont fixFont( TDEGlobalSettings::fixedFont() ); TQFont fixFont( TDEGlobalSettings::fixedFont() );
fixFont.setBold(true); fixFont.setBold(true);
@ -1051,7 +1051,7 @@ SDisplayCursor::EFocusMode COptionDialog::cursorFocusMode( void )
CColorListBox::CColorListBox( TQWidget *parent, const char *name, WFlags f ) CColorListBox::CColorListBox( TQWidget *parent, const char *name, WFlags f )
:KListBox( parent, name, f ), mCurrentOnDragEnter(-1) :TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1)
{ {
connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) );
setAcceptDrops( true); setAcceptDrops( true);

6
khexedit/optiondialog.h
Unescape View File

@ -31,7 +31,7 @@ class TQPushbutton;
class TQRadioButton; class TQRadioButton;
class TQSpinBox; class TQSpinBox;
class TQComboBox; class TQComboBox;
class KFontChooser; class TDEFontChooser;
#include <kdialogbase.h> #include <kdialogbase.h>
@ -40,7 +40,7 @@ class KFontChooser;
class CColorListBox : public KListBox class CColorListBox : public TDEListBox
{ {
Q_OBJECT Q_OBJECT
@ -198,7 +198,7 @@ class COptionDialog : public KDialogBase
struct SFontWidgets struct SFontWidgets
{ {
TQCheckBox *checkSystem; TQCheckBox *checkSystem;
KFontChooser *chooser; TDEFontChooser *chooser;
TQLineEdit *nonPrintInput; TQLineEdit *nonPrintInput;
}; };
struct SFileWidgets struct SFileWidgets

16
khexedit/parts/kpart/khepart.cpp
Unescape View File

@ -72,7 +72,7 @@ void KHexEditPart::setupTools( bool BrowserViewWanted )
if( !BrowserViewWanted ) new TDEClipboardTool( this ); if( !BrowserViewWanted ) new TDEClipboardTool( this );
new KZoomToolet( this ); new KZoomToolet( this );
new KSelectToolet( this ); new TDESelectToolet( this );
new KHEValueCodingToolet( this ); new KHEValueCodingToolet( this );
new KHECharEncodingToolet( this ); new KHECharEncodingToolet( this );
new KHEResizeStyleToolet( this ); new KHEResizeStyleToolet( this );
@ -81,7 +81,7 @@ void KHexEditPart::setupTools( bool BrowserViewWanted )
*/ */
void KHexEditPart::setupActions( bool BrowserViewWanted ) void KHexEditPart::setupActions( bool BrowserViewWanted )
{ {
KActionCollection *AC = actionCollection(); TDEActionCollection *AC = actionCollection();
// create our actions // create our actions
CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( TQT_TQOBJECT(HexEdit), TQT_SLOT(copy()), AC ); CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( TQT_TQOBJECT(HexEdit), TQT_SLOT(copy()), AC );
@ -89,7 +89,7 @@ void KHexEditPart::setupActions( bool BrowserViewWanted )
KStdAction::deselect( this, TQT_SLOT(slotUnselect()), AC ); KStdAction::deselect( this, TQT_SLOT(slotUnselect()), AC );
// value encoding // value encoding
CodingAction = new KSelectAction( i18n("&Value Coding"), 0, AC, "view_valuecoding" ); CodingAction = new TDESelectAction( i18n("&Value Coding"), 0, AC, "view_valuecoding" );
TQStringList List; TQStringList List;
List.append( i18n("&Hexadecimal") ); List.append( i18n("&Hexadecimal") );
List.append( i18n("&Decimal") ); List.append( i18n("&Decimal") );
@ -99,17 +99,17 @@ void KHexEditPart::setupActions( bool BrowserViewWanted )
connect( CodingAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetCoding(int)) ); connect( CodingAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetCoding(int)) );
// document encoding // document encoding
EncodingAction = new KSelectAction( i18n("&Char Encoding"), 0, AC, "view_charencoding" ); EncodingAction = new TDESelectAction( i18n("&Char Encoding"), 0, AC, "view_charencoding" );
EncodingAction->setItems( KCharCodec::codecNames() ); EncodingAction->setItems( KCharCodec::codecNames() );
connect( EncodingAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetEncoding(int)) ); connect( EncodingAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetEncoding(int)) );
ShowUnprintableAction = new KToggleAction( i18n("Show &Unprintable Chars (<32)"), 0, this, TQT_SLOT(slotSetShowUnprintable()), actionCollection(), "view_showunprintable" ); ShowUnprintableAction = new TDEToggleAction( i18n("Show &Unprintable Chars (<32)"), 0, this, TQT_SLOT(slotSetShowUnprintable()), actionCollection(), "view_showunprintable" );
KStdAction::zoomIn( TQT_TQOBJECT(HexEdit), TQT_SLOT(zoomIn()), actionCollection() ); KStdAction::zoomIn( TQT_TQOBJECT(HexEdit), TQT_SLOT(zoomIn()), actionCollection() );
KStdAction::zoomOut( TQT_TQOBJECT(HexEdit), TQT_SLOT(zoomOut()), actionCollection() ); KStdAction::zoomOut( TQT_TQOBJECT(HexEdit), TQT_SLOT(zoomOut()), actionCollection() );
// resize style // resize style
ResizeStyleAction = new KSelectAction( i18n("&Resize Style"), 0, AC, "resizestyle" ); ResizeStyleAction = new TDESelectAction( i18n("&Resize Style"), 0, AC, "resizestyle" );
List.clear(); List.clear();
List.append( i18n("&No Resize") ); List.append( i18n("&No Resize") );
List.append( i18n("&Lock Groups") ); List.append( i18n("&Lock Groups") );
@ -117,10 +117,10 @@ void KHexEditPart::setupActions( bool BrowserViewWanted )
ResizeStyleAction->setItems( List ); ResizeStyleAction->setItems( List );
connect( ResizeStyleAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetResizeStyle(int)) ); connect( ResizeStyleAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetResizeStyle(int)) );
ShowOffsetColumnAction = new KToggleAction( i18n("&Line Offset"), Key_F11, this, TQT_SLOT(slotToggleOffsetColumn()), AC, "view_lineoffset" ); ShowOffsetColumnAction = new TDEToggleAction( i18n("&Line Offset"), Key_F11, this, TQT_SLOT(slotToggleOffsetColumn()), AC, "view_lineoffset" );
// show buffer columns // show buffer columns
ToggleColumnsAction = new KSelectAction( i18n("&Columns"), 0, AC, "togglecolumns" ); ToggleColumnsAction = new TDESelectAction( i18n("&Columns"), 0, AC, "togglecolumns" );
List.clear(); List.clear();
List.append( i18n("&Values Column") ); List.append( i18n("&Values Column") );
List.append( i18n("&Chars Column") ); List.append( i18n("&Chars Column") );

20
khexedit/parts/kpart/khepart.h
Unescape View File

@ -24,9 +24,9 @@
#include "kbigbuffer.h" #include "kbigbuffer.h"
// forward declarations // forward declarations
class KRadioAction; class TDERadioAction;
class KToggleAction; class TDEToggleAction;
class KSelectAction; class TDESelectAction;
namespace KHE namespace KHE
{ {
@ -80,15 +80,15 @@ class KHexEditPart : public KParts::ReadOnlyPart
KBigBuffer Wrapping; KBigBuffer Wrapping;
// edit menu // edit menu
KAction *CopyAction; TDEAction *CopyAction;
// view menu // view menu
KSelectAction *CodingAction; TDESelectAction *CodingAction;
KSelectAction *EncodingAction; TDESelectAction *EncodingAction;
KToggleAction *ShowUnprintableAction; TDEToggleAction *ShowUnprintableAction;
// settings menu // settings menu
KSelectAction *ResizeStyleAction; TDESelectAction *ResizeStyleAction;
KToggleAction *ShowOffsetColumnAction; TDEToggleAction *ShowOffsetColumnAction;
KSelectAction *ToggleColumnsAction; TDESelectAction *ToggleColumnsAction;
}; };
} }

112
khexedit/toplevel.cc
Unescape View File

@ -46,7 +46,7 @@
TQPtrList<KHexEdit> KHexEdit::mWindowList; TQPtrList<KHexEdit> KHexEdit::mWindowList;
KHexEdit::KHexEdit( void ) KHexEdit::KHexEdit( void )
: KMainWindow(0, "toplevel"), mStartupOffset(0), : TDEMainWindow(0, "toplevel"), mStartupOffset(0),
mIsModified(0) mIsModified(0)
{ {
mWindowList.append( this ); mWindowList.append( this );
@ -130,7 +130,7 @@ void KHexEdit::setupActions( void )
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection()); actionCollection());
mAction.insert = new KAction( i18n("&Insert..."), CTRL+Key_I, mAction.insert = new TDEAction( i18n("&Insert..."), CTRL+Key_I,
TQT_TQOBJECT(editor()), TQT_SLOT(insertFile()), actionCollection(), "insert_file" ); TQT_TQOBJECT(editor()), TQT_SLOT(insertFile()), actionCollection(), "insert_file" );
mAction.openRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); mAction.openRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() );
mAction.save = KStdAction::save( TQT_TQOBJECT(editor()), TQT_SLOT(save()), actionCollection() ); mAction.save = KStdAction::save( TQT_TQOBJECT(editor()), TQT_SLOT(save()), actionCollection() );
@ -140,17 +140,17 @@ actionCollection());
mAction.close = KStdAction::close( TQT_TQOBJECT(editor()), TQT_SLOT(close()), actionCollection() ); mAction.close = KStdAction::close( TQT_TQOBJECT(editor()), TQT_SLOT(close()), actionCollection() );
mAction.print = KStdAction::print( TQT_TQOBJECT(editor()), TQT_SLOT(print()), actionCollection() ); mAction.print = KStdAction::print( TQT_TQOBJECT(editor()), TQT_SLOT(print()), actionCollection() );
mAction.exportData = new KAction( i18n("E&xport..."), 0, mAction.exportData = new TDEAction( i18n("E&xport..."), 0,
TQT_TQOBJECT(editor()), TQT_SLOT(exportDialog()), actionCollection(), "export" ); TQT_TQOBJECT(editor()), TQT_SLOT(exportDialog()), actionCollection(), "export" );
mAction.cancel = new KAction( i18n("&Cancel Operation"), mAction.cancel = new TDEAction( i18n("&Cancel Operation"),
"stop", 0, TQT_TQOBJECT(editor()), TQT_SLOT(stop()), actionCollection(), "cancel" ); "stop", 0, TQT_TQOBJECT(editor()), TQT_SLOT(stop()), actionCollection(), "cancel" );
mAction.readOnly = new KToggleAction( i18n("&Read Only"), mAction.readOnly = new TDEToggleAction( i18n("&Read Only"),
0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleWriteProtection()),actionCollection(), "read_only" ); 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleWriteProtection()),actionCollection(), "read_only" );
mAction.resizeLock = new KToggleAction( i18n("&Allow Resize"), mAction.resizeLock = new TDEToggleAction( i18n("&Allow Resize"),
0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleResizeLock()),actionCollection(), "resize_lock" ); 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleResizeLock()),actionCollection(), "resize_lock" );
mAction.newWindow = new KAction( i18n("N&ew Window"), mAction.newWindow = new TDEAction( i18n("N&ew Window"),
0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()),actionCollection(), "new_window" ); 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()),actionCollection(), "new_window" );
mAction.closeWindow= new KAction( i18n("Close &Window"), mAction.closeWindow= new TDEAction( i18n("Close &Window"),
0, TQT_TQOBJECT(this), TQT_SLOT(closeWindow()),actionCollection(), "close_window" ); 0, TQT_TQOBJECT(this), TQT_SLOT(closeWindow()),actionCollection(), "close_window" );
mAction.quit = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(closeProgram()), actionCollection() ); mAction.quit = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(closeProgram()), actionCollection() );
@ -165,27 +165,27 @@ actionCollection());
mAction.findNext = KStdAction::findNext( TQT_TQOBJECT(editor()), TQT_SLOT(findNext()), actionCollection() ); mAction.findNext = KStdAction::findNext( TQT_TQOBJECT(editor()), TQT_SLOT(findNext()), actionCollection() );
mAction.findPrev = KStdAction::findPrev( TQT_TQOBJECT(editor()),TQT_SLOT(findPrevious()),actionCollection() ); mAction.findPrev = KStdAction::findPrev( TQT_TQOBJECT(editor()),TQT_SLOT(findPrevious()),actionCollection() );
mAction.replace = KStdAction::replace( TQT_TQOBJECT(editor()), TQT_SLOT(replace()), actionCollection() ); mAction.replace = KStdAction::replace( TQT_TQOBJECT(editor()), TQT_SLOT(replace()), actionCollection() );
mAction.gotoOffset = new KAction( i18n("&Goto Offset..."), CTRL+Key_G, mAction.gotoOffset = new TDEAction( i18n("&Goto Offset..."), CTRL+Key_G,
TQT_TQOBJECT(editor()), TQT_SLOT(gotoOffset()),actionCollection(), "goto_offset" ); TQT_TQOBJECT(editor()), TQT_SLOT(gotoOffset()),actionCollection(), "goto_offset" );
mAction.insertPattern = new KAction( i18n("&Insert Pattern..."), CTRL+Key_Insert, mAction.insertPattern = new TDEAction( i18n("&Insert Pattern..."), CTRL+Key_Insert,
TQT_TQOBJECT(editor()), TQT_SLOT(insertPattern()), actionCollection(), "insert_pattern" ); TQT_TQOBJECT(editor()), TQT_SLOT(insertPattern()), actionCollection(), "insert_pattern" );
mAction.copyAsText = new KAction( i18n("Copy as &Text"), 0, mAction.copyAsText = new TDEAction( i18n("Copy as &Text"), 0,
TQT_TQOBJECT(editor()), TQT_SLOT(copyText()), actionCollection(), "copy_as_text" ); TQT_TQOBJECT(editor()), TQT_SLOT(copyText()), actionCollection(), "copy_as_text" );
mAction.pasteToNewFile = new KAction( i18n("Paste into New &File"), 0, mAction.pasteToNewFile = new TDEAction( i18n("Paste into New &File"), 0,
TQT_TQOBJECT(editor()), TQT_SLOT(pasteNewFile()), actionCollection(), "paste_into_new_file" ); TQT_TQOBJECT(editor()), TQT_SLOT(pasteNewFile()), actionCollection(), "paste_into_new_file" );
mAction.pasteToNewWindow = new KAction( i18n("Paste into New &Window"), 0, mAction.pasteToNewWindow = new TDEAction( i18n("Paste into New &Window"), 0,
TQT_TQOBJECT(this), TQT_SLOT(pasteNewWindow()), actionCollection(), "paste_into_new_window" ); TQT_TQOBJECT(this), TQT_SLOT(pasteNewWindow()), actionCollection(), "paste_into_new_window" );
mAction.hexadecimal = new KRadioAction( i18n("&Hexadecimal"), mAction.hexadecimal = new TDERadioAction( i18n("&Hexadecimal"),
0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_hex" ); 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_hex" );
mAction.decimal = new KRadioAction( i18n("&Decimal"), mAction.decimal = new TDERadioAction( i18n("&Decimal"),
0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_dec" ); 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_dec" );
mAction.octal = new KRadioAction( i18n("&Octal"), mAction.octal = new TDERadioAction( i18n("&Octal"),
0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_oct" ); 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_oct" );
mAction.binary = new KRadioAction( i18n("&Binary"), mAction.binary = new TDERadioAction( i18n("&Binary"),
0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_bin" ); 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_bin" );
mAction.textOnly = new KRadioAction( i18n("&Text"), mAction.textOnly = new TDERadioAction( i18n("&Text"),
0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_text" ); 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_text" );
mAction.hexadecimal->setExclusiveGroup( "displayMode" ); mAction.hexadecimal->setExclusiveGroup( "displayMode" );
mAction.decimal->setExclusiveGroup( "displayMode" ); mAction.decimal->setExclusiveGroup( "displayMode" );
@ -193,87 +193,87 @@ actionCollection());
mAction.binary->setExclusiveGroup( "displayMode" ); mAction.binary->setExclusiveGroup( "displayMode" );
mAction.textOnly->setExclusiveGroup( "displayMode" ); mAction.textOnly->setExclusiveGroup( "displayMode" );
mAction.showOffsetColumn = new KToggleAction( i18n("Show O&ffset Column"), mAction.showOffsetColumn = new TDEToggleAction( i18n("Show O&ffset Column"),
0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetColumnVisibility()),actionCollection(), "show_offset_column" ); 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetColumnVisibility()),actionCollection(), "show_offset_column" );
mAction.showTextColumn = new KToggleAction( i18n("Show Te&xt Field"), mAction.showTextColumn = new TDEToggleAction( i18n("Show Te&xt Field"),
0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleTextColumnVisibility()),actionCollection(), "show_text_field" ); 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleTextColumnVisibility()),actionCollection(), "show_text_field" );
mAction.offsetAsDecimal = new KToggleAction( i18n("Off&set as Decimal"), mAction.offsetAsDecimal = new TDEToggleAction( i18n("Off&set as Decimal"),
0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetAsDecimal()),actionCollection(), "offset_as_decimal" ); 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetAsDecimal()),actionCollection(), "offset_as_decimal" );
mAction.dataUppercase = new KToggleAction( i18n("&Upper Case (Data)"), mAction.dataUppercase = new TDEToggleAction( i18n("&Upper Case (Data)"),
0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleDataUppercase()),actionCollection(), "upper_case_data" ); 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleDataUppercase()),actionCollection(), "upper_case_data" );
mAction.offsetUppercase = new KToggleAction( i18n("Upper &Case (Offset)"), mAction.offsetUppercase = new TDEToggleAction( i18n("Upper &Case (Offset)"),
0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetUppercase()),actionCollection(), "upper_case_offset" ); 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetUppercase()),actionCollection(), "upper_case_offset" );
mAction.defaultEncoding = new KRadioAction( i18n("&Default encoding", "&Default"), mAction.defaultEncoding = new TDERadioAction( i18n("&Default encoding", "&Default"),
0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_default" ); 0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_default" );
mAction.usAsciiEncoding = new KRadioAction( i18n("US-&ASCII (7 bit)"), mAction.usAsciiEncoding = new TDERadioAction( i18n("US-&ASCII (7 bit)"),
0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_ascii"); 0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_ascii");
mAction.ebcdicEncoding = new KRadioAction( i18n("&EBCDIC"), mAction.ebcdicEncoding = new TDERadioAction( i18n("&EBCDIC"),
0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_ebcdic" ); 0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_ebcdic" );
// mAction.customEncoding = new KAction( i18n("&Custom..."), // mAction.customEncoding = new TDEAction( i18n("&Custom..."),
// 0, TQT_TQOBJECT(editor()), TQT_SLOT( encoding()), actionCollection(), "enc_custom" ); // 0, TQT_TQOBJECT(editor()), TQT_SLOT( encoding()), actionCollection(), "enc_custom" );
mAction.defaultEncoding->setExclusiveGroup( "encodingMode" ); mAction.defaultEncoding->setExclusiveGroup( "encodingMode" );
mAction.usAsciiEncoding->setExclusiveGroup( "encodingMode" ); mAction.usAsciiEncoding->setExclusiveGroup( "encodingMode" );
mAction.ebcdicEncoding->setExclusiveGroup( "encodingMode" ); mAction.ebcdicEncoding->setExclusiveGroup( "encodingMode" );
mAction.strings = new KAction( i18n("&Extract Strings..."), 0, mAction.strings = new TDEAction( i18n("&Extract Strings..."), 0,
TQT_TQOBJECT(editor()), TQT_SLOT(strings()), actionCollection(), "extract_strings" ); TQT_TQOBJECT(editor()), TQT_SLOT(strings()), actionCollection(), "extract_strings" );
// mAction.recordViewer = new KAction( i18n("&Record Viewer"), 0, // mAction.recordViewer = new TDEAction( i18n("&Record Viewer"), 0,
// TQT_TQOBJECT(editor()), TQT_SLOT(recordView()), actionCollection(), "record_viewer" ); // TQT_TQOBJECT(editor()), TQT_SLOT(recordView()), actionCollection(), "record_viewer" );
mAction.filter = new KAction( i18n("&Binary Filter..."), 0, mAction.filter = new TDEAction( i18n("&Binary Filter..."), 0,
TQT_TQOBJECT(editor()), TQT_SLOT(filter()), actionCollection(), "binary_filter" ); TQT_TQOBJECT(editor()), TQT_SLOT(filter()), actionCollection(), "binary_filter" );
mAction.characterTable = new KAction( i18n("&Character Table"), 0, mAction.characterTable = new TDEAction( i18n("&Character Table"), 0,
TQT_TQOBJECT(editor()), TQT_SLOT(chart()), actionCollection(), "char_table" ); TQT_TQOBJECT(editor()), TQT_SLOT(chart()), actionCollection(), "char_table" );
mAction.converter = new KAction( i18n("C&onverter"), 0, mAction.converter = new TDEAction( i18n("C&onverter"), 0,
TQT_TQOBJECT(editor()), TQT_SLOT(converter()), actionCollection(), "converter" ); TQT_TQOBJECT(editor()), TQT_SLOT(converter()), actionCollection(), "converter" );
mAction.statistics = new KAction( i18n("&Statistics"), 0, mAction.statistics = new TDEAction( i18n("&Statistics"), 0,
TQT_TQOBJECT(editor()), TQT_SLOT(statistics()), actionCollection(), "statistics" ); TQT_TQOBJECT(editor()), TQT_SLOT(statistics()), actionCollection(), "statistics" );
mAction.addBookmark = KStdAction::addBookmark( TQT_TQOBJECT(editor()), mAction.addBookmark = KStdAction::addBookmark( TQT_TQOBJECT(editor()),
TQT_SLOT(addBookmark()), actionCollection() ); TQT_SLOT(addBookmark()), actionCollection() );
mAction.replaceBookmark = new KAction( i18n("&Replace Bookmark"), CTRL+Key_E, mAction.replaceBookmark = new TDEAction( i18n("&Replace Bookmark"), CTRL+Key_E,
TQT_TQOBJECT(editor()), TQT_SLOT(replaceBookmark()), actionCollection(), "replace_bookmark"); TQT_TQOBJECT(editor()), TQT_SLOT(replaceBookmark()), actionCollection(), "replace_bookmark");
mAction.removeBookmark = new KAction( i18n("R&emove Bookmark"), CTRL+Key_U, mAction.removeBookmark = new TDEAction( i18n("R&emove Bookmark"), CTRL+Key_U,
TQT_TQOBJECT(editor()), TQT_SLOT(removeBookmark()), actionCollection(), "remove_bookmark" ); TQT_TQOBJECT(editor()), TQT_SLOT(removeBookmark()), actionCollection(), "remove_bookmark" );
mAction.removeAllBookmark = new KAction( i18n("Re&move All"), 0, mAction.removeAllBookmark = new TDEAction( i18n("Re&move All"), 0,
TQT_TQOBJECT(editor()), TQT_SLOT(removeAllBookmark()), actionCollection(), "remove_all_bookmarks" ); TQT_TQOBJECT(editor()), TQT_SLOT(removeAllBookmark()), actionCollection(), "remove_all_bookmarks" );
mAction.nextBookmark = new KAction( i18n("Goto &Next Bookmark"), mAction.nextBookmark = new TDEAction( i18n("Goto &Next Bookmark"),
ALT+Key_Down, TQT_TQOBJECT(editor()), ALT+Key_Down, TQT_TQOBJECT(editor()),
TQT_SLOT(gotoNextBookmark()), actionCollection(), "next_bookmark" ); TQT_SLOT(gotoNextBookmark()), actionCollection(), "next_bookmark" );
mAction.prevBookmark = new KAction( i18n("Goto &Previous Bookmark"), mAction.prevBookmark = new TDEAction( i18n("Goto &Previous Bookmark"),
ALT+Key_Up, TQT_TQOBJECT(editor()), ALT+Key_Up, TQT_TQOBJECT(editor()),
TQT_SLOT(gotoPrevBookmark()), actionCollection(), "prev_bookmark" ); TQT_SLOT(gotoPrevBookmark()), actionCollection(), "prev_bookmark" );
createStandardStatusBarAction(); createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
mAction.showFullPath = new KToggleAction( i18n("Show F&ull Path"), mAction.showFullPath = new TDEToggleAction( i18n("Show F&ull Path"),
0, TQT_TQOBJECT(this), TQT_SLOT(showFullPath()), actionCollection(), "show_full_path" ); 0, TQT_TQOBJECT(this), TQT_SLOT(showFullPath()), actionCollection(), "show_full_path" );
mAction.tabHide = new KRadioAction( i18n("&Hide"), mAction.tabHide = new TDERadioAction( i18n("&Hide"),
0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_hide" ); 0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_hide" );
mAction.tabShowAboveEditor = new KRadioAction( i18n("&Above Editor"), mAction.tabShowAboveEditor = new TDERadioAction( i18n("&Above Editor"),
0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_above" ); 0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_above" );
mAction.tabShowBelowEditor = new KRadioAction( i18n("&Below Editor"), mAction.tabShowBelowEditor = new TDERadioAction( i18n("&Below Editor"),
0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_below" ); 0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_below" );
mAction.tabHide->setExclusiveGroup( "editorTab" ); mAction.tabHide->setExclusiveGroup( "editorTab" );
mAction.tabShowAboveEditor->setExclusiveGroup( "editorTab" ); mAction.tabShowAboveEditor->setExclusiveGroup( "editorTab" );
mAction.tabShowBelowEditor->setExclusiveGroup( "editorTab" ); mAction.tabShowBelowEditor->setExclusiveGroup( "editorTab" );
mAction.conversionHide = new KRadioAction( i18n("&Hide"), mAction.conversionHide = new TDERadioAction( i18n("&Hide"),
0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_hide"); 0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_hide");
mAction.conversionFloat = new KRadioAction( i18n("&Floating"), mAction.conversionFloat = new TDERadioAction( i18n("&Floating"),
0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_float"); 0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_float");
mAction.conversionEmbed = new KRadioAction( i18n("&Embed in Main Window"), mAction.conversionEmbed = new TDERadioAction( i18n("&Embed in Main Window"),
0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_embed"); 0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_embed");
mAction.conversionHide->setExclusiveGroup( "conversionField" ); mAction.conversionHide->setExclusiveGroup( "conversionField" );
mAction.conversionFloat->setExclusiveGroup( "conversionField" ); mAction.conversionFloat->setExclusiveGroup( "conversionField" );
mAction.conversionEmbed->setExclusiveGroup( "conversionField" ); mAction.conversionEmbed->setExclusiveGroup( "conversionField" );
mAction.searchHide = new KRadioAction( i18n("&Hide"), mAction.searchHide = new TDERadioAction( i18n("&Hide"),
0, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_hide" ); 0, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_hide" );
mAction.searchShowAboveEditor = new KRadioAction( i18n("&Above Editor"), mAction.searchShowAboveEditor = new TDERadioAction( i18n("&Above Editor"),
Key_F5, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_above" ); Key_F5, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_above" );
mAction.searchShowBelowEditor = new KRadioAction( i18n("&Below Editor"), mAction.searchShowBelowEditor = new TDERadioAction( i18n("&Below Editor"),
Key_F6, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_below" ); Key_F6, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_below" );
mAction.searchHide->setExclusiveGroup( "searchBar" ); mAction.searchHide->setExclusiveGroup( "searchBar" );
mAction.searchShowAboveEditor->setExclusiveGroup( "searchBar" ); mAction.searchShowAboveEditor->setExclusiveGroup( "searchBar" );
@ -281,7 +281,7 @@ actionCollection());
KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(writeConfiguration()), actionCollection()); KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(writeConfiguration()), actionCollection());
KStdAction::preferences(TQT_TQOBJECT(editor()) ,TQT_SLOT(options()),actionCollection() ); KStdAction::preferences(TQT_TQOBJECT(editor()) ,TQT_SLOT(options()),actionCollection() );
// mAction.favorites = new KAction( i18n("P&rofiles..."), 0, // mAction.favorites = new TDEAction( i18n("P&rofiles..."), 0,
// TQT_TQOBJECT(editor()), TQT_SLOT(favorites()), actionCollection(), "favorites" ); // TQT_TQOBJECT(editor()), TQT_SLOT(favorites()), actionCollection(), "favorites" );
KStdAction::help( TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection() ); KStdAction::help( TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection() );
@ -376,7 +376,7 @@ void KHexEdit::initialize( bool openFiles )
if ( openFiles && editor()->openFile() != SDisplayMisc::none ) if ( openFiles && editor()->openFile() != SDisplayMisc::none )
{ {
// Code modified from tdelibs/tdeui/kactionclasses.cpp KRecentFilesAction::loadEntries // Code modified from tdelibs/tdeui/kactionclasses.cpp TDERecentFilesAction::loadEntries
TDEConfig* config = kapp->config(); TDEConfig* config = kapp->config();
@ -809,7 +809,7 @@ void KHexEdit::fileState( SFileState &state )
void KHexEdit::layoutChanged( const SDisplayLayout &layout ) void KHexEdit::layoutChanged( const SDisplayLayout &layout )
{ {
KRadioAction *radioAction; TDERadioAction *radioAction;
if( layout.primaryMode == SDisplayLayout::hexadecimal ) if( layout.primaryMode == SDisplayLayout::hexadecimal )
{ {
@ -914,7 +914,7 @@ void KHexEdit::bookmarkChanged( TQPtrList<SCursorOffset> &list )
return; return;
} }
mAction.bookmarkList.append(new KActionSeparator()); mAction.bookmarkList.append(new TDEActionSeparator());
TQString text, offset; TQString text, offset;
int i=0; int i=0;
@ -923,11 +923,11 @@ void KHexEdit::bookmarkChanged( TQPtrList<SCursorOffset> &list )
{ {
offset.sprintf("%04X:%04X", p->offset>>16, p->offset&0x0000FFFF ); offset.sprintf("%04X:%04X", p->offset>>16, p->offset&0x0000FFFF );
text = i18n("Offset: %1").arg(offset); text = i18n("Offset: %1").arg(offset);
KAction *action = new KAction(text, 0, mAction.bookmarkMapper, TQT_SLOT(map()), TQT_TQOBJECT(this), text.latin1()); TDEAction *action = new TDEAction(text, 0, mAction.bookmarkMapper, TQT_SLOT(map()), TQT_TQOBJECT(this), text.latin1());
int key = acceleratorNumKey( i ); int key = acceleratorNumKey( i );
if( key > 0 ) if( key > 0 )
{ {
action->setShortcut(KShortcut(ALT+key)); action->setShortcut(TDEShortcut(ALT+key));
} }
mAction.bookmarkMapper->setMapping(action, i); mAction.bookmarkMapper->setMapping(action, i);
mAction.bookmarkList.append(action); mAction.bookmarkList.append(action);
@ -996,7 +996,7 @@ void KHexEdit::editMode( CHexBuffer::EEditMode editMode )
void KHexEdit::encodingChanged( const SEncodeState &encodeState ) void KHexEdit::encodingChanged( const SEncodeState &encodeState )
{ {
KRadioAction *radioAction; TDERadioAction *radioAction;
if( encodeState.mode == CConversion::cnvDefault ) if( encodeState.mode == CConversion::cnvDefault )
{ {
@ -1324,7 +1324,7 @@ bool KHexEdit::eventFilter( TQObject *o, TQEvent *event )
return( true ); return( true );
} }
return KMainWindow::eventFilter( o, event ); return TDEMainWindow::eventFilter( o, event );
} }

162
khexedit/toplevel.h
Unescape View File

@ -35,17 +35,17 @@
#include "statusbarprogress.h" #include "statusbarprogress.h"
class TQSignalMapper; class TQSignalMapper;
class KAction; class TDEAction;
class KRecentFilesAction; class TDERecentFilesAction;
class KRadioAction; class TDERadioAction;
class KSelectAction; class TDESelectAction;
class KToggleAction; class TDEToggleAction;
class KToolBarButton; class TDEToolBarButton;
class KURL; class KURL;
class CDragLabel; class CDragLabel;
class KHexEdit : public KMainWindow class KHexEdit : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -64,79 +64,79 @@ class KHexEdit : public KMainWindow
struct SActionList struct SActionList
{ {
KAction *insert; TDEAction *insert;
KRecentFilesAction *openRecent; TDERecentFilesAction *openRecent;
KAction *save; TDEAction *save;
KAction *saveAs; TDEAction *saveAs;
KAction *revert; TDEAction *revert;
KAction *close; TDEAction *close;
KAction *print; TDEAction *print;
KAction *exportData; TDEAction *exportData;
KAction *cancel; TDEAction *cancel;
KToggleAction *readOnly; TDEToggleAction *readOnly;
KToggleAction *resizeLock; TDEToggleAction *resizeLock;
KAction *newWindow; TDEAction *newWindow;
KAction *closeWindow; TDEAction *closeWindow;
KAction *quit; TDEAction *quit;
KAction *undo; TDEAction *undo;
KAction *redo; TDEAction *redo;
KAction *cut; TDEAction *cut;
KAction *copy; TDEAction *copy;
KAction *paste; TDEAction *paste;
KAction *selectAll; TDEAction *selectAll;
KAction *unselect; TDEAction *unselect;
KAction *find; TDEAction *find;
KAction *findNext; TDEAction *findNext;
KAction *findPrev; TDEAction *findPrev;
KAction *replace; TDEAction *replace;
KAction *gotoOffset; TDEAction *gotoOffset;
KAction *insertPattern; TDEAction *insertPattern;
KAction *copyAsText; TDEAction *copyAsText;
KAction *pasteToNewFile; TDEAction *pasteToNewFile;
KAction *pasteToNewWindow; TDEAction *pasteToNewWindow;
KRadioAction *hexadecimal; TDERadioAction *hexadecimal;
KRadioAction *decimal; TDERadioAction *decimal;
KRadioAction *octal; TDERadioAction *octal;
KRadioAction *binary; TDERadioAction *binary;
KRadioAction *textOnly; TDERadioAction *textOnly;
KToggleAction *showOffsetColumn; TDEToggleAction *showOffsetColumn;
KToggleAction *showTextColumn; TDEToggleAction *showTextColumn;
KToggleAction *offsetAsDecimal; TDEToggleAction *offsetAsDecimal;
KToggleAction *dataUppercase; TDEToggleAction *dataUppercase;
KToggleAction *offsetUppercase; TDEToggleAction *offsetUppercase;
KRadioAction *defaultEncoding; TDERadioAction *defaultEncoding;
KRadioAction *usAsciiEncoding; TDERadioAction *usAsciiEncoding;
KRadioAction *ebcdicEncoding; TDERadioAction *ebcdicEncoding;
// KAction *customEncoding; // TDEAction *customEncoding;
KAction *strings; TDEAction *strings;
// KAction *recordViewer; // TDEAction *recordViewer;
KAction *filter; TDEAction *filter;
KAction *characterTable; TDEAction *characterTable;
KAction *converter; TDEAction *converter;
KAction *statistics; TDEAction *statistics;
KAction *addBookmark; TDEAction *addBookmark;
KAction *replaceBookmark; TDEAction *replaceBookmark;
KAction *removeBookmark; TDEAction *removeBookmark;
KAction *removeAllBookmark; TDEAction *removeAllBookmark;
KAction *nextBookmark; TDEAction *nextBookmark;
KAction *prevBookmark; TDEAction *prevBookmark;
KToggleAction *showFullPath; TDEToggleAction *showFullPath;
KRadioAction *tabHide; TDERadioAction *tabHide;
KRadioAction *tabShowBelowEditor; TDERadioAction *tabShowBelowEditor;
KRadioAction *tabShowAboveEditor; TDERadioAction *tabShowAboveEditor;
KRadioAction *conversionHide; TDERadioAction *conversionHide;
KRadioAction *conversionFloat; TDERadioAction *conversionFloat;
KRadioAction *conversionEmbed; TDERadioAction *conversionEmbed;
KRadioAction *searchHide; TDERadioAction *searchHide;
KRadioAction *searchShowAboveEditor; TDERadioAction *searchShowAboveEditor;
KRadioAction *searchShowBelowEditor; TDERadioAction *searchShowBelowEditor;
// KAction *favorites; // TDEAction *favorites;
TQPtrList< KAction > bookmarkList; TQPtrList< TDEAction > bookmarkList;
TQSignalMapper *bookmarkMapper; TQSignalMapper *bookmarkMapper;
}; };
@ -234,7 +234,7 @@ protected:
SActionList mAction; SActionList mAction;
CDragLabel *mDragLabel; CDragLabel *mDragLabel;
KToolBarButton *mWriteProtectButton; TDEToolBarButton *mWriteProtectButton;
bool mIsModified; bool mIsModified;
bool mShowFullPath; bool mShowFullPath;

56
kjots/KJotsMain.cpp
Unescape View File

@ -56,7 +56,7 @@ extern KIconLoader* global_pix_loader;
// KJOTSMAIN // KJOTSMAIN
//---------------------------------------------------------------------- //----------------------------------------------------------------------
KJotsMain::KJotsMain(const char* name) KJotsMain::KJotsMain(const char* name)
: KMainWindow(0,name), : TDEMainWindow(0,name),
currentEntry(0), currentEntry(0),
invalidMoveFlag(false) invalidMoveFlag(false)
{ {
@ -70,7 +70,7 @@ KJotsMain::KJotsMain(const char* name)
splitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); splitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
// the subject list // the subject list
subjectList = new KListView(splitter, "subjectList"); subjectList = new TDEListView(splitter, "subjectList");
subjectList->setRootIsDecorated(true); subjectList->setRootIsDecorated(true);
subjectList->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding)); subjectList->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
subjectList->setMinimumWidth(subjectList->fontMetrics().maxWidth() * 10 + 5); subjectList->setMinimumWidth(subjectList->fontMetrics().maxWidth() * 10 + 5);
@ -104,42 +104,42 @@ KJotsMain::KJotsMain(const char* name)
splitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, 2, 1)); splitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, 2, 1));
// create actions // create actions
actions[ACTION_NEXT_BOOK] = new KAction(i18n("Next Book"), TQString(), CTRL + Key_D, TQT_TQOBJECT(this), actions[ACTION_NEXT_BOOK] = new TDEAction(i18n("Next Book"), TQString(), CTRL + Key_D, TQT_TQOBJECT(this),
TQT_SLOT(nextBook()), actionCollection(), "go_next_book"); TQT_SLOT(nextBook()), actionCollection(), "go_next_book");
actions[ACTION_PREV_BOOK] = new KAction(i18n("Previous Book"), TQString(), CTRL + SHIFT + Key_D, TQT_TQOBJECT(this), actions[ACTION_PREV_BOOK] = new TDEAction(i18n("Previous Book"), TQString(), CTRL + SHIFT + Key_D, TQT_TQOBJECT(this),
TQT_SLOT(prevBook()), actionCollection(), "go_prev_book"); TQT_SLOT(prevBook()), actionCollection(), "go_prev_book");
actions[ACTION_NEXT_PAGE] = new KAction(i18n("Next Page"), TQString(), CTRL + Key_PageDown, TQT_TQOBJECT(this), actions[ACTION_NEXT_PAGE] = new TDEAction(i18n("Next Page"), TQString(), CTRL + Key_PageDown, TQT_TQOBJECT(this),
TQT_SLOT(nextPage()), actionCollection(), "go_next_page"); TQT_SLOT(nextPage()), actionCollection(), "go_next_page");
actions[ACTION_PREV_PAGE] = new KAction(i18n("Previous Page"), TQString(), CTRL + Key_PageUp, TQT_TQOBJECT(this), actions[ACTION_PREV_PAGE] = new TDEAction(i18n("Previous Page"), TQString(), CTRL + Key_PageUp, TQT_TQOBJECT(this),
TQT_SLOT(prevPage()), actionCollection(), "go_prev_page"); TQT_SLOT(prevPage()), actionCollection(), "go_prev_page");
actions[ACTION_NEW_PAGE] = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newEntry()), actionCollection()); actions[ACTION_NEW_PAGE] = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newEntry()), actionCollection());
actions[ACTION_NEW_PAGE]->setText(i18n("&New Page")); actions[ACTION_NEW_PAGE]->setText(i18n("&New Page"));
actions[ACTION_NEW_BOOK] = new KAction(i18n("New &Book..."), "contents", CTRL + SHIFT + Key_N, TQT_TQOBJECT(this), actions[ACTION_NEW_BOOK] = new TDEAction(i18n("New &Book..."), "contents", CTRL + SHIFT + Key_N, TQT_TQOBJECT(this),
TQT_SLOT(createNewBook()), actionCollection(), "new_book"); TQT_SLOT(createNewBook()), actionCollection(), "new_book");
exportPageMenu = new KActionMenu(i18n("Export Page"), actionCollection(), "save_page_to"); exportPageMenu = new TDEActionMenu(i18n("Export Page"), actionCollection(), "save_page_to");
actions[ACTION_PAGE2TEXT] = new KAction(i18n("To Text File..."), TQString(), 0, TQT_TQOBJECT(this), actions[ACTION_PAGE2TEXT] = new TDEAction(i18n("To Text File..."), TQString(), 0, TQT_TQOBJECT(this),
TQT_SLOT(writePage()), actionCollection(), "save_page_to_ascii"); TQT_SLOT(writePage()), actionCollection(), "save_page_to_ascii");
actions[ACTION_PAGE2TEXT]->plug(exportPageMenu->popupMenu()); actions[ACTION_PAGE2TEXT]->plug(exportPageMenu->popupMenu());
actions[ACTION_PAGE2HTML] = new KAction(i18n("To HTML File..."), TQString(), 0, TQT_TQOBJECT(this), actions[ACTION_PAGE2HTML] = new TDEAction(i18n("To HTML File..."), TQString(), 0, TQT_TQOBJECT(this),
TQT_SLOT(writePageToHTML()), actionCollection(), "save_page_to_html"); TQT_SLOT(writePageToHTML()), actionCollection(), "save_page_to_html");
actions[ACTION_PAGE2HTML]->plug(exportPageMenu->popupMenu()); actions[ACTION_PAGE2HTML]->plug(exportPageMenu->popupMenu());
exportBookMenu = new KActionMenu(i18n("Export Book"), actionCollection(), "save_book_to"); exportBookMenu = new TDEActionMenu(i18n("Export Book"), actionCollection(), "save_book_to");
actions[ACTION_BOOK2TEXT] = new KAction(i18n("To Text File..."), TQString(), 0, TQT_TQOBJECT(this), actions[ACTION_BOOK2TEXT] = new TDEAction(i18n("To Text File..."), TQString(), 0, TQT_TQOBJECT(this),
TQT_SLOT(writeBook()), actionCollection(), "save_book_to_ascii"); TQT_SLOT(writeBook()), actionCollection(), "save_book_to_ascii");
actions[ACTION_BOOK2TEXT]->plug(exportBookMenu->popupMenu()); actions[ACTION_BOOK2TEXT]->plug(exportBookMenu->popupMenu());
actions[ACTION_BOOK2HTML] = new KAction(i18n("To HTML File..."), TQString(), 0, TQT_TQOBJECT(this), actions[ACTION_BOOK2HTML] = new TDEAction(i18n("To HTML File..."), TQString(), 0, TQT_TQOBJECT(this),
TQT_SLOT(writeBookToHTML()), actionCollection(), "save_book_to_html"); TQT_SLOT(writeBookToHTML()), actionCollection(), "save_book_to_html");
actions[ACTION_BOOK2HTML]->plug(exportBookMenu->popupMenu()); actions[ACTION_BOOK2HTML]->plug(exportBookMenu->popupMenu());
actions[ACTION_DELETE_PAGE] = new KAction(i18n("&Delete Page"), "editdelete", CTRL + Key_Delete, TQT_TQOBJECT(this), actions[ACTION_DELETE_PAGE] = new TDEAction(i18n("&Delete Page"), "editdelete", CTRL + Key_Delete, TQT_TQOBJECT(this),
TQT_SLOT(deleteEntry()), actionCollection(), "del_page"); TQT_SLOT(deleteEntry()), actionCollection(), "del_page");
actions[ACTION_DELETE_BOOK] = new KAction(i18n("Delete Boo&k"), "editdelete", CTRL + SHIFT + Key_Delete, TQT_TQOBJECT(this), actions[ACTION_DELETE_BOOK] = new TDEAction(i18n("Delete Boo&k"), "editdelete", CTRL + SHIFT + Key_Delete, TQT_TQOBJECT(this),
TQT_SLOT(deleteBook()), actionCollection(), "del_folder"); TQT_SLOT(deleteBook()), actionCollection(), "del_folder");
actions[ACTION_MANUAL_SAVE] = new KAction(i18n("Manual Save"), 0, KStdAccel::save(), actions[ACTION_MANUAL_SAVE] = new TDEAction(i18n("Manual Save"), 0, TDEStdAccel::save(),
TQT_TQOBJECT(this), TQT_SLOT(autoSave()), actionCollection(), "manual_save"); TQT_TQOBJECT(this), TQT_SLOT(autoSave()), actionCollection(), "manual_save");
actions[ACTION_PRINT] = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection()); actions[ACTION_PRINT] = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection());
actions[ACTION_QUIT] = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); actions[ACTION_QUIT] = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
@ -150,7 +150,7 @@ KJotsMain::KJotsMain(const char* name)
actions[ACTION_COPY] = KStdAction::copy(TQT_TQOBJECT(me_text), TQT_SLOT(copy()), actionCollection()); actions[ACTION_COPY] = KStdAction::copy(TQT_TQOBJECT(me_text), TQT_SLOT(copy()), actionCollection());
connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_COPY], TQT_SLOT(setEnabled(bool))); connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_COPY], TQT_SLOT(setEnabled(bool)));
actions[ACTION_COPY]->setEnabled(false); actions[ACTION_COPY]->setEnabled(false);
actions[ACTION_PASTE2TITLE] = new KAction(i18n("Copy &into Page Title"), "editcopy", CTRL+Key_T, TQT_TQOBJECT(this), actions[ACTION_PASTE2TITLE] = new TDEAction(i18n("Copy &into Page Title"), "editcopy", CTRL+Key_T, TQT_TQOBJECT(this),
TQT_SLOT(copySelection()), actionCollection(), "copyIntoTitle"); TQT_SLOT(copySelection()), actionCollection(), "copyIntoTitle");
connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_PASTE2TITLE], TQT_SLOT(setEnabled(bool))); connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_PASTE2TITLE], TQT_SLOT(setEnabled(bool)));
actions[ACTION_PASTE2TITLE]->setEnabled(false); actions[ACTION_PASTE2TITLE]->setEnabled(false);
@ -161,14 +161,14 @@ KJotsMain::KJotsMain(const char* name)
actions[ACTION_FIND_NEXT]->setEnabled(false); actions[ACTION_FIND_NEXT]->setEnabled(false);
actions[ACTION_REPLACE] = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( slotReplace() ), actionCollection() ); actions[ACTION_REPLACE] = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( slotReplace() ), actionCollection() );
actions[ACTION_RENAME] = new KAction(i18n("Rename..."), TQString(), CTRL + Key_M, TQT_TQOBJECT(this), actions[ACTION_RENAME] = new TDEAction(i18n("Rename..."), TQString(), CTRL + Key_M, TQT_TQOBJECT(this),
TQT_SLOT(slotRenameEntry()), actionCollection(), "rename_entry"); TQT_SLOT(slotRenameEntry()), actionCollection(), "rename_entry");
actions[ACTION_INSERT_DATE] = new KAction(i18n("Insert Date"), "date", CTRL + Key_I, TQT_TQOBJECT(this), actions[ACTION_INSERT_DATE] = new TDEAction(i18n("Insert Date"), "date", CTRL + Key_I, TQT_TQOBJECT(this),
TQT_SLOT(insertDate()), actionCollection(), "insert_date"); TQT_SLOT(insertDate()), actionCollection(), "insert_date");
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection()); KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection());
bookmarkMenu = new KActionMenu(i18n("&Bookmarks"), "bookmarks", actionCollection(), "bookmarks"); bookmarkMenu = new TDEActionMenu(i18n("&Bookmarks"), "bookmarks", actionCollection(), "bookmarks");
KJotsBookmarks* bookmarks = new KJotsBookmarks(this); KJotsBookmarks* bookmarks = new KJotsBookmarks(this);
connect(bookmarks, TQT_SIGNAL(openPage(const TQString&)), TQT_SLOT(jumpToBookmark(const TQString&))); connect(bookmarks, TQT_SIGNAL(openPage(const TQString&)), TQT_SLOT(jumpToBookmark(const TQString&)));
new KBookmarkMenu(KBookmarkManager::managerForFile(locateLocal("appdata","bookmarks.xml")), new KBookmarkMenu(KBookmarkManager::managerForFile(locateLocal("appdata","bookmarks.xml")),
@ -177,7 +177,7 @@ KJotsMain::KJotsMain(const char* name)
setupGUI(); setupGUI();
/* /*
* TODO: add a bookmark bar, something like this * TODO: add a bookmark bar, something like this
KToolBar* bar = dynamic_cast<KToolBar *>(child("bookmarkToolBar", "KToolBar")); TDEToolBar* bar = dynamic_cast<TDEToolBar *>(child("bookmarkToolBar", "TDEToolBar"));
new KBookmarkBar(KBookmarkManager::managerForFile(locateLocal("appdata","bookmarks.xml")), new KBookmarkBar(KBookmarkManager::managerForFile(locateLocal("appdata","bookmarks.xml")),
bookmarks, bar, actionCollection(), this, "BookmarkBar"); bookmarks, bar, actionCollection(), this, "BookmarkBar");
if (bar->count() == 0) if (bar->count() == 0)
@ -215,8 +215,8 @@ KJotsMain::KJotsMain(const char* name)
this, TQT_SLOT(slotExpandBook(TQListViewItem*))); this, TQT_SLOT(slotExpandBook(TQListViewItem*)));
connect(subjectList, TQT_SIGNAL(collapsed(TQListViewItem*)), connect(subjectList, TQT_SIGNAL(collapsed(TQListViewItem*)),
this, TQT_SLOT(slotCollapseBook(TQListViewItem*))); this, TQT_SLOT(slotCollapseBook(TQListViewItem*)));
connect(subjectList, TQT_SIGNAL(contextMenu(KListView*,TQListViewItem*,const TQPoint&)), connect(subjectList, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)),
this, TQT_SLOT(showListviewContextMenu(KListView*,TQListViewItem*,const TQPoint&))); this, TQT_SLOT(showListviewContextMenu(TDEListView*,TQListViewItem*,const TQPoint&)));
connect(subjectList, TQT_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)), connect(subjectList, TQT_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)),
this, TQT_SLOT(slotItemRenamed(TQListViewItem*,const TQString&,int))); this, TQT_SLOT(slotItemRenamed(TQListViewItem*,const TQString&,int)));
connect(roTextView, TQT_SIGNAL(urlClick(const TQString&)), connect(roTextView, TQT_SIGNAL(urlClick(const TQString&)),
@ -654,10 +654,10 @@ void KJotsMain::slotFindSuccessful()
actions[ACTION_FIND_NEXT]->setEnabled(true); actions[ACTION_FIND_NEXT]->setEnabled(true);
} }
void KJotsMain::showListviewContextMenu(KListView*, TQListViewItem* i, const TQPoint& p) void KJotsMain::showListviewContextMenu(TDEListView*, TQListViewItem* i, const TQPoint& p)
{ {
if ( invalidMoveFlag ) return; //Prevent race condition if ( invalidMoveFlag ) return; //Prevent race condition
KActionMenu* am = new KActionMenu(TQT_TQOBJECT(this)); TDEActionMenu* am = new TDEActionMenu(TQT_TQOBJECT(this));
if (!i) if (!i)
{ {
@ -670,7 +670,7 @@ void KJotsMain::showListviewContextMenu(KListView*, TQListViewItem* i, const TQP
am->insert(actions[ACTION_NEW_PAGE]); am->insert(actions[ACTION_NEW_PAGE]);
am->insert(actions[ACTION_RENAME]); am->insert(actions[ACTION_RENAME]);
am->insert(exportBookMenu); am->insert(exportBookMenu);
am->insert(new KActionSeparator(am)); am->insert(new TDEActionSeparator(am));
am->insert(actions[ACTION_DELETE_BOOK]); am->insert(actions[ACTION_DELETE_BOOK]);
} }
else else
@ -679,7 +679,7 @@ void KJotsMain::showListviewContextMenu(KListView*, TQListViewItem* i, const TQP
am->insert(actions[ACTION_NEW_PAGE]); am->insert(actions[ACTION_NEW_PAGE]);
am->insert(actions[ACTION_RENAME]); am->insert(actions[ACTION_RENAME]);
am->insert(exportPageMenu); am->insert(exportPageMenu);
am->insert(new KActionSeparator(am)); am->insert(new TDEActionSeparator(am));
am->insert(actions[ACTION_DELETE_PAGE]); am->insert(actions[ACTION_DELETE_PAGE]);
} }
@ -1173,7 +1173,7 @@ KJotsBook* KJotsMain::currentBook()
{ {
return dynamic_cast<KJotsBook*>(e); return dynamic_cast<KJotsBook*>(e);
} }
e = dynamic_cast<KJotsEntryBase*>(e->KListViewItem::parent()); e = dynamic_cast<KJotsEntryBase*>(e->TDEListViewItem::parent());
} }
return 0; return 0;

24
kjots/KJotsMain.h
Unescape View File

@ -32,18 +32,18 @@
class TQGroupBox; class TQGroupBox;
class TQWidgetStack; class TQWidgetStack;
class KTextBrowser; class KTextBrowser;
class KAccel; class TDEAccel;
class KJotsMain; class KJotsMain;
class KToolBar; class TDEToolBar;
class KListBox; class TDEListBox;
class KListView; class TDEListView;
class KPopupMenu; class TDEPopupMenu;
class ConfigureDialog; class ConfigureDialog;
class KEdFind; class KEdFind;
class KEdReplace; class KEdReplace;
class TQTimer; class TQTimer;
class KAction; class TDEAction;
class KActionMenu; class TDEActionMenu;
class KJotsPage; class KJotsPage;
class KJotsBook; class KJotsBook;
@ -79,7 +79,7 @@ class KJotsEdit;
#define ACTION_INSERT_DATE 23 #define ACTION_INSERT_DATE 23
#define ACTION_MAX 24 #define ACTION_MAX 24
class KJotsMain : public KMainWindow class KJotsMain : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -131,7 +131,7 @@ class KJotsMain : public KMainWindow
void prevPage(); void prevPage();
// handling page changes in the listview // handling page changes in the listview
void showListviewContextMenu(KListView* l, TQListViewItem* i, const TQPoint& p); void showListviewContextMenu(TDEListView* l, TQListViewItem* i, const TQPoint& p);
void linkClicked(const TQString&); void linkClicked(const TQString&);
void autoSave(void); void autoSave(void);
@ -150,7 +150,7 @@ class KJotsMain : public KMainWindow
TQButtonGroup *bg_top; TQButtonGroup *bg_top;
KJotsEdit *me_text; KJotsEdit *me_text;
KTextBrowser *roTextView; KTextBrowser *roTextView;
KListView *subjectList; TDEListView *subjectList;
KJotsEntryBase *currentEntry; KJotsEntryBase *currentEntry;
TQSplitter *splitter; TQSplitter *splitter;
TQWidgetStack *textStack; TQWidgetStack *textStack;
@ -158,8 +158,8 @@ class KJotsMain : public KMainWindow
TQTimer* m_autosaveTimer; TQTimer* m_autosaveTimer;
bool invalidMoveFlag; //!< Used to fix a race condition. See Bug #109299 bool invalidMoveFlag; //!< Used to fix a race condition. See Bug #109299
KAction* actions[ACTION_MAX]; TDEAction* actions[ACTION_MAX];
KActionMenu *exportPageMenu, *exportBookMenu, *bookmarkMenu; TDEActionMenu *exportPageMenu, *exportBookMenu, *bookmarkMenu;
}; };
#endif // KJotsMain_included #endif // KJotsMain_included

2
kjots/confpagefont.ui
Unescape View File

@ -22,7 +22,7 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<widget class="KFontChooser"> <widget class="TDEFontChooser">
<property name="name"> <property name="name">
<cstring>kcfg_Font</cstring> <cstring>kcfg_Font</cstring>
</property> </property>

2
kjots/kjotsedit.cpp
Unescape View File

@ -44,7 +44,7 @@ KJotsEdit::KJotsEdit (TQWidget* parent, const char* name)
setTextFormat(TQt::PlainText); setTextFormat(TQt::PlainText);
setWordWrap(TQTextEdit::WidgetWidth); setWordWrap(TQTextEdit::WidgetWidth);
setLinkUnderline(true); setLinkUnderline(true);
web_menu = new KPopupMenu(this);; web_menu = new TDEPopupMenu(this);;
web_menu->insertItem(i18n("Open URL"), this, TQT_SLOT(openUrl()) ); web_menu->insertItem(i18n("Open URL"), this, TQT_SLOT(openUrl()) );
} }

4
kjots/kjotsedit.h
Unescape View File

@ -24,7 +24,7 @@
#define __KJOTSEDIT_H #define __KJOTSEDIT_H
#include <keditcl.h> #include <keditcl.h>
class KPopupMenu; class TDEPopupMenu;
class KJotsPage; class KJotsPage;
class KJotsEdit : public KEdit class KJotsEdit : public KEdit
@ -47,7 +47,7 @@ class KJotsEdit : public KEdit
protected: protected:
virtual void mousePressEvent (TQMouseEvent *e); virtual void mousePressEvent (TQMouseEvent *e);
KPopupMenu *web_menu; TDEPopupMenu *web_menu;
KJotsPage *m_entry; //!< The entry we are editing. It needs to be kept informed. KJotsPage *m_entry; //!< The entry we are editing. It needs to be kept informed.
}; };

18
kjots/kjotsentry.cpp
Unescape View File

@ -69,16 +69,16 @@ TQString htmlFooter()
// KJotsEntryBase // KJotsEntryBase
// //
KJotsEntryBase::KJotsEntryBase(KListView* parent, TQListViewItem* after=0) KJotsEntryBase::KJotsEntryBase(TDEListView* parent, TQListViewItem* after=0)
:KListViewItem(parent,after) :TDEListViewItem(parent,after)
{ {
m_id = 0; m_id = 0;
m_saveInProgress = m_dirty = false; m_saveInProgress = m_dirty = false;
m_parent = 0; m_parent = 0;
} }
KJotsEntryBase::KJotsEntryBase(KListViewItem* parent, TQListViewItem* after=0) KJotsEntryBase::KJotsEntryBase(TDEListViewItem* parent, TQListViewItem* after=0)
:KListViewItem(parent,after) :TDEListViewItem(parent,after)
{ {
m_id = 0; m_id = 0;
m_saveInProgress = m_dirty = false; m_saveInProgress = m_dirty = false;
@ -93,9 +93,9 @@ void KJotsEntryBase::setSubject(const TQString& subj)
void KJotsEntryBase::setText(int column, const TQString& text) void KJotsEntryBase::setText(int column, const TQString& text)
{ {
if (column == 0 && text.isEmpty()) if (column == 0 && text.isEmpty())
KListViewItem::setText(0, defaultSubject()); TDEListViewItem::setText(0, defaultSubject());
else else
KListViewItem::setText(column, text); TDEListViewItem::setText(column, text);
} }
/*! /*!
@ -217,13 +217,13 @@ int KJotsEntryBase::printTitleBox(TQString title, KPrinter& printer, TQPainter&
// KJotsBook // KJotsBook
// //
KJotsBook::KJotsBook(KListView* parent, TQListViewItem* after) KJotsBook::KJotsBook(TDEListView* parent, TQListViewItem* after)
: KJotsEntryBase(parent, after) : KJotsEntryBase(parent, after)
{ {
init(); init();
} }
KJotsBook::KJotsBook(KListViewItem* parent, TQListViewItem* after) KJotsBook::KJotsBook(TDEListViewItem* parent, TQListViewItem* after)
: KJotsEntryBase(parent, after) : KJotsEntryBase(parent, after)
{ {
init(); init();
@ -982,7 +982,7 @@ void KJotsPage::slotSaveResult(TDEIO::Job *)
void KJotsPage::print(TQFont& defaultFont) void KJotsPage::print(TQFont& defaultFont)
{ {
KJotsEntryBase* book = dynamic_cast<KJotsEntryBase*>(KListViewItem::parent()); KJotsEntryBase* book = dynamic_cast<KJotsEntryBase*>(TDEListViewItem::parent());
TQString docName = book->subject(); TQString docName = book->subject();
if (!subject().isNull()) if (!subject().isNull())

10
kjots/kjotsentry.h
Unescape View File

@ -46,13 +46,13 @@ namespace TDEIO
class Job; class Job;
} }
class KJotsEntryBase : public TQObject, public KListViewItem class KJotsEntryBase : public TQObject, public TDEListViewItem
{ {
Q_OBJECT Q_OBJECT
public: public:
KJotsEntryBase(KListView*, TQListViewItem*); KJotsEntryBase(TDEListView*, TQListViewItem*);
KJotsEntryBase(KListViewItem*, TQListViewItem*); KJotsEntryBase(TDEListViewItem*, TQListViewItem*);
public: public:
virtual void setSubject(const TQString&); virtual void setSubject(const TQString&);
@ -101,8 +101,8 @@ class KJotsBook : public KJotsEntryBase
Q_OBJECT Q_OBJECT
public: public:
KJotsBook(KListView*, TQListViewItem* after = 0); KJotsBook(TDEListView*, TQListViewItem* after = 0);
KJotsBook(KListViewItem*, TQListViewItem* after = 0); KJotsBook(TDEListViewItem*, TQListViewItem* after = 0);
~KJotsBook(); ~KJotsBook();
static bool isBookFile(const TQString& book); static bool isBookFile(const TQString& book);

2
klaptopdaemon/daemondock.cpp
Unescape View File

@ -479,7 +479,7 @@ void laptop_dock::mouseReleaseEvent( TQMouseEvent *e )
// fall through // fall through
case Qt::RightButton: case Qt::RightButton:
{ {
KPopupMenu *menu = contextMenu(); TDEPopupMenu *menu = contextMenu();
contextMenuAboutToShow( menu ); contextMenuAboutToShow( menu );
menu->popup( e->globalPos() ); menu->popup( e->globalPos() );
} }

4
klaptopdaemon/daemondock.h
Unescape View File

@ -34,7 +34,7 @@ class KPCMCIACard;
class TQPopupMenu; class TQPopupMenu;
class TQVBox; class TQVBox;
class TQSlider; class TQSlider;
class KPopupMenu; class TDEPopupMenu;
#include <tqmap.h> #include <tqmap.h>
@ -102,7 +102,7 @@ private:
_insertActions; _insertActions;
TDEInstance *instance; // handle so we get our pretty icons right TDEInstance *instance; // handle so we get our pretty icons right
KPopupMenu *rightPopup; TDEPopupMenu *rightPopup;
}; };
#endif #endif

26
kmilo/generic/generic_monitor.cpp
Unescape View File

@ -79,23 +79,23 @@ bool GenericMonitor::init()
return false; // exit early if we are not supposed to run return false; // exit early if we are not supposed to run
static const ShortcutInfo shortcuts[] = { static const ShortcutInfo shortcuts[] = {
{ "Search", KShortcut("XF86Search"), TQT_SLOT(launchSearch()) }, { "Search", TDEShortcut("XF86Search"), TQT_SLOT(launchSearch()) },
{ "Home Folder", KShortcut("XF86MyComputer"), TQT_SLOT(launchHomeFolder()) }, { "Home Folder", TDEShortcut("XF86MyComputer"), TQT_SLOT(launchHomeFolder()) },
{ "Mail", KShortcut("XF86Mail"), TQT_SLOT(launchMail()) }, { "Mail", TDEShortcut("XF86Mail"), TQT_SLOT(launchMail()) },
{ "Audio Media", KShortcut("XF86AudioMedia"), TQT_SLOT(launchMusic()) }, { "Audio Media", TDEShortcut("XF86AudioMedia"), TQT_SLOT(launchMusic()) },
{ "Music", KShortcut("XF86Music"), TQT_SLOT(launchMusic()) }, { "Music", TDEShortcut("XF86Music"), TQT_SLOT(launchMusic()) },
{ "Browser", KShortcut("XF86WWW"), TQT_SLOT(launchBrowser()) }, { "Browser", TDEShortcut("XF86WWW"), TQT_SLOT(launchBrowser()) },
{ "Calculator", KShortcut("XF86Calculator"), TQT_SLOT(launchCalculator()) }, { "Calculator", TDEShortcut("XF86Calculator"), TQT_SLOT(launchCalculator()) },
{ "Terminal", KShortcut("XF86Terminal"), TQT_SLOT(launchTerminal()) }, { "Terminal", TDEShortcut("XF86Terminal"), TQT_SLOT(launchTerminal()) },
{ "Eject", KShortcut("XF86Eject"), TQT_SLOT(eject()) }, { "Eject", TDEShortcut("XF86Eject"), TQT_SLOT(eject()) },
{ "Help", KShortcut("XF86Launch0"), TQT_SLOT(launchHelp()) }, { "Help", TDEShortcut("XF86Launch0"), TQT_SLOT(launchHelp()) },
{ "Light Bulb", KShortcut("XF86LightBulb"), TQT_SLOT(lightBulb()) }, { "Light Bulb", TDEShortcut("XF86LightBulb"), TQT_SLOT(lightBulb()) },
{ "Battery", KShortcut("XF86LaunchB"), TQT_SLOT(pmBattery()) }, { "Battery", TDEShortcut("XF86LaunchB"), TQT_SLOT(pmBattery()) },
{ "FastVolumeUp", TQt::Key_VolumeUp, TQT_SLOT(fastVolumeUp()) }, { "FastVolumeUp", TQt::Key_VolumeUp, TQT_SLOT(fastVolumeUp()) },
{ "FastVolumeDown", TQt::Key_VolumeDown, TQT_SLOT(fastVolumeDown()) }, { "FastVolumeDown", TQt::Key_VolumeDown, TQT_SLOT(fastVolumeDown()) },
{ "SlowVolumeUp", TQt::CTRL+TQt::Key_VolumeUp, TQT_SLOT(slowVolumeUp()) }, { "SlowVolumeUp", TQt::CTRL+TQt::Key_VolumeUp, TQT_SLOT(slowVolumeUp()) },
{ "SlowVolumeDown", TQt::CTRL+TQt::Key_VolumeDown, TQT_SLOT(slowVolumeDown()) }, { "SlowVolumeDown", TQt::CTRL+TQt::Key_VolumeDown, TQT_SLOT(slowVolumeDown()) },
{ "Mute", KShortcut("XF86AudioMute"), TQT_SLOT(mute()) } { "Mute", TDEShortcut("XF86AudioMute"), TQT_SLOT(mute()) }
}; };
ga = new TDEGlobalAccel(this, "miloGenericAccel"); ga = new TDEGlobalAccel(this, "miloGenericAccel");

2
kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp
Unescape View File

@ -37,7 +37,7 @@ KMultiFormListBoxWindowed::KMultiFormListBoxWindowed(KMultiFormListBoxFactory *f
TQHBoxLayout *innerLayout = new TQHBoxLayout(); TQHBoxLayout *innerLayout = new TQHBoxLayout();
_layout->addLayout(innerLayout); _layout->addLayout(innerLayout);
_listbox = new KListBox(this,"listbox"); _listbox = new TDEListBox(this,"listbox");
_listbox->setSelectionMode(TQListBox::Single); _listbox->setSelectionMode(TQListBox::Single);
innerLayout->addWidget(_listbox); innerLayout->addWidget(_listbox);

2
kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h
Unescape View File

@ -56,7 +56,7 @@ private:
TQVBoxLayout* _layout; TQVBoxLayout* _layout;
KMultiFormListBoxFactory* _factory; KMultiFormListBoxFactory* _factory;
TQPtrList<TQPushButton> _buttonList; TQPtrList<TQPushButton> _buttonList;
KListBox* _listbox; TDEListBox* _listbox;
virtual void delElement(TQWidget *); // Deletes the given element virtual void delElement(TQWidget *); // Deletes the given element
virtual void delAnElement(); virtual void delAnElement();
void addElement(); void addElement();

6
kregexpeditor/KMultiFormListBox/widgetwindow.cpp
Unescape View File

@ -19,19 +19,19 @@
#include "windowlistboxitem.h" #include "windowlistboxitem.h"
#include <iostream> #include <iostream>
WidgetWindow::WidgetWindow(KMultiFormListBoxFactory *factory, KListBox *lb) WidgetWindow::WidgetWindow(KMultiFormListBoxFactory *factory, TDEListBox *lb)
:KDialogBase(Plain, i18n("Widget Configuration"), Ok | Cancel, Ok, 0, "ConfigWindow", false) :KDialogBase(Plain, i18n("Widget Configuration"), Ok | Cancel, Ok, 0, "ConfigWindow", false)
{ {
init(factory, lb); init(factory, lb);
} }
WidgetWindow::WidgetWindow(KMultiFormListBoxFactory *factory, KMultiFormListBoxEntry *widget, KListBox *lb) WidgetWindow::WidgetWindow(KMultiFormListBoxFactory *factory, KMultiFormListBoxEntry *widget, TDEListBox *lb)
:KDialogBase(Plain, i18n("Widget Configuration"), Ok | Cancel, Ok, 0, "ConfigWindow", false) :KDialogBase(Plain, i18n("Widget Configuration"), Ok | Cancel, Ok, 0, "ConfigWindow", false)
{ {
init(factory, lb, widget); init(factory, lb, widget);
} }
void WidgetWindow::init(KMultiFormListBoxFactory *factory, KListBox *lb, KMultiFormListBoxEntry *widget) void WidgetWindow::init(KMultiFormListBoxFactory *factory, TDEListBox *lb, KMultiFormListBoxEntry *widget)
{ {
listbox = lb; listbox = lb;
myFact = factory; myFact = factory;

8
kregexpeditor/KMultiFormListBox/widgetwindow.h
Unescape View File

@ -36,9 +36,9 @@ class WidgetWindow :public KDialogBase
friend class KMultiFormListBoxWindowed; friend class KMultiFormListBoxWindowed;
friend class WindowListboxItem; friend class WindowListboxItem;
WidgetWindow(KMultiFormListBoxFactory *, KListBox *); WidgetWindow(KMultiFormListBoxFactory *, TDEListBox *);
WidgetWindow(KMultiFormListBoxFactory *, KMultiFormListBoxEntry *widget, KListBox *); WidgetWindow(KMultiFormListBoxFactory *, KMultiFormListBoxEntry *widget, TDEListBox *);
void init(KMultiFormListBoxFactory *, KListBox *, KMultiFormListBoxEntry *widget = 0); void init(KMultiFormListBoxFactory *, TDEListBox *, KMultiFormListBoxEntry *widget = 0);
void display(); void display();
KMultiFormListBoxEntry *entry(); KMultiFormListBoxEntry *entry();
WidgetWindow *clone(); WidgetWindow *clone();
@ -52,7 +52,7 @@ private:
KMultiFormListBoxFactory *myFact; KMultiFormListBoxFactory *myFact;
KMultiFormListBoxEntry *myWidget; KMultiFormListBoxEntry *myWidget;
TQByteArray _backup; TQByteArray _backup;
KListBox *listbox; TDEListBox *listbox;
WindowListboxItem *myListboxItem; WindowListboxItem *myListboxItem;
bool initialShow; bool initialShow;
}; };

2
kregexpeditor/qt-only/compat.h
Unescape View File

@ -30,7 +30,7 @@ TQString i18n( const TQString& a, const TQString& b);
#define isatty(x) 0 #define isatty(x) 0
#define KTextBrowser TQTextBrowser #define KTextBrowser TQTextBrowser
#define KListBox TQListBox #define TDEListBox TQListBox
#define KFileDialog TQFileDialog #define KFileDialog TQFileDialog
#define KPushButton TQPushButton #define KPushButton TQPushButton

4
ksim/monitorprefs.cpp
Unescape View File

@ -30,7 +30,7 @@
#include <pluginloader.h> #include <pluginloader.h>
KSim::MonitorPrefs::MonitorPrefs(TQWidget *parent, const char *name) KSim::MonitorPrefs::MonitorPrefs(TQWidget *parent, const char *name)
: KListView(parent, name) : TDEListView(parent, name)
{ {
addColumn(i18n("Monitor")); addColumn(i18n("Monitor"));
addColumn(i18n("Description")); addColumn(i18n("Description"));
@ -44,7 +44,7 @@ KSim::MonitorPrefs::MonitorPrefs(TQWidget *parent, const char *name)
setAllColumnsShowFocus(true); setAllColumnsShowFocus(true);
setSelectionMode(TQListView::Single); setSelectionMode(TQListView::Single);
// Scan for .desktop files and enter them into the KListView // Scan for .desktop files and enter them into the TDEListView
m_locatedFiles = TDEGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop"); m_locatedFiles = TDEGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop");
m_locatedFiles.sort(); m_locatedFiles.sort();
TQStringList::ConstIterator it; TQStringList::ConstIterator it;

2
ksim/monitorprefs.h
Unescape View File

@ -27,7 +27,7 @@ namespace KSim
{ {
class Config; class Config;
class MonitorPrefs : public KListView class MonitorPrefs : public TDEListView
{ {
Q_OBJECT Q_OBJECT

2
ksim/monitors/cpu/ksimcpu.cpp
Unescape View File

@ -367,7 +367,7 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name)
TQVBoxLayout * mainLayout = new TQVBoxLayout( this ); TQVBoxLayout * mainLayout = new TQVBoxLayout( this );
mainLayout->setSpacing( 6 ); mainLayout->setSpacing( 6 );
m_listView = new KListView(this); m_listView = new TDEListView(this);
m_listView->addColumn(i18n("Available CPUs")); m_listView->addColumn(i18n("Available CPUs"));
m_listView->addColumn(i18n("Chart Format")); m_listView->addColumn(i18n("Chart Format"));
m_listView->setAllColumnsShowFocus(true); m_listView->setAllColumnsShowFocus(true);

4
ksim/monitors/cpu/ksimcpu.h
Unescape View File

@ -35,7 +35,7 @@ class TQLabel;
class TQGroupBox; class TQGroupBox;
class TQTimer; class TQTimer;
class TQListViewItem; class TQListViewItem;
class KListView; class TDEListView;
class CpuPlugin : public KSim::PluginObject class CpuPlugin : public KSim::PluginObject
{ {
@ -216,7 +216,7 @@ class CpuConfig : public KSim::PluginPage
private: private:
uint addCpus(); uint addCpus();
KListView *m_listView; TDEListView *m_listView;
TQGroupBox *m_legendBox; TQGroupBox *m_legendBox;
TQLabel *m_totalNiceLabel; TQLabel *m_totalNiceLabel;
TQLabel *m_totalLabel; TQLabel *m_totalLabel;

2
ksim/monitors/disk/ksimdisk.cpp
Unescape View File

@ -478,7 +478,7 @@ DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name)
m_layout = new TQVBoxLayout(this); m_layout = new TQVBoxLayout(this);
m_layout->setSpacing(6); m_layout->setSpacing(6);
m_listview = new KListView(this); m_listview = new TDEListView(this);
m_listview->addColumn(i18n("Disks")); m_listview->addColumn(i18n("Disks"));
m_layout->addWidget(m_listview); m_layout->addWidget(m_listview);

4
ksim/monitors/disk/ksimdisk.h
Unescape View File

@ -29,7 +29,7 @@
class TQTextStream; class TQTextStream;
class TQTimer; class TQTimer;
class KListView; class TDEListView;
class TQVBoxLayout; class TQVBoxLayout;
class TQVButtonGroup; class TQVButtonGroup;
class TQRadioButton; class TQRadioButton;
@ -146,7 +146,7 @@ class DiskConfig : public KSim::PluginPage
private: private:
TQVBoxLayout *m_layout; TQVBoxLayout *m_layout;
KListView *m_listview; TDEListView *m_listview;
TQPushButton *m_add; TQPushButton *m_add;
TQPushButton *m_remove; TQPushButton *m_remove;
TQVButtonGroup *m_buttonBox; TQVButtonGroup *m_buttonBox;

2
ksim/monitors/filesystem/fsystemconfig.cpp
Unescape View File

@ -52,7 +52,7 @@ FsystemConfig::FsystemConfig(KSim::PluginObject *parent, const char *name)
m_mainLayout = new TQGridLayout(this); m_mainLayout = new TQGridLayout(this);
m_mainLayout->setSpacing(6); m_mainLayout->setSpacing(6);
m_availableMounts = new KListView(this); m_availableMounts = new TDEListView(this);
m_availableMounts->addColumn(i18n("Mounted Partition")); m_availableMounts->addColumn(i18n("Mounted Partition"));
m_availableMounts->addColumn(i18n("Device")); m_availableMounts->addColumn(i18n("Device"));
m_availableMounts->addColumn(i18n("Type")); m_availableMounts->addColumn(i18n("Type"));

4
ksim/monitors/filesystem/fsystemconfig.h
Unescape View File

@ -24,7 +24,7 @@
#include "filesystemstats.h" #include "filesystemstats.h"
class KIntSpinBox; class KIntSpinBox;
class KListView; class TDEListView;
class TQGridLayout; class TQGridLayout;
class TQCheckBox; class TQCheckBox;
class TQLabel; class TQLabel;
@ -52,7 +52,7 @@ class FsystemConfig : public KSim::PluginPage
TQCheckBox *m_splitNames; TQCheckBox *m_splitNames;
TQLabel *m_intervalLabel; TQLabel *m_intervalLabel;
KIntSpinBox *m_updateTimer; KIntSpinBox *m_updateTimer;
KListView *m_availableMounts; TDEListView *m_availableMounts;
TQGridLayout *m_mainLayout; TQGridLayout *m_mainLayout;
FilesystemStats::List m_entries; FilesystemStats::List m_entries;
}; };

2
ksim/monitors/filesystem/ksimfsystem.h
Unescape View File

@ -23,7 +23,7 @@
#include <pluginmodule.h> #include <pluginmodule.h>
#include "fsystemiface.h" #include "fsystemiface.h"
class KPopupMenu; class TDEPopupMenu;
class FilesystemWidget; class FilesystemWidget;
class TQTimer; class TQTimer;

8
ksim/monitors/lm_sensors/sensorsconfig.cpp
Unescape View File

@ -58,7 +58,7 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name)
m_layout->setSpacing(6); m_layout->setSpacing(6);
m_neverShown = true; m_neverShown = true;
m_sensorView = new KListView(this); m_sensorView = new TDEListView(this);
m_sensorView->addColumn(i18n("No.")); m_sensorView->addColumn(i18n("No."));
m_sensorView->addColumn(i18n("Label")); m_sensorView->addColumn(i18n("Label"));
m_sensorView->addColumn(i18n("Sensors")); m_sensorView->addColumn(i18n("Sensors"));
@ -67,8 +67,8 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name)
m_sensorView->setColumnWidth(1, 60); m_sensorView->setColumnWidth(1, 60);
m_sensorView->setColumnWidth(2, 80); m_sensorView->setColumnWidth(2, 80);
m_sensorView->setAllColumnsShowFocus(true); m_sensorView->setAllColumnsShowFocus(true);
connect(m_sensorView, TQT_SIGNAL(contextMenu(KListView *, connect(m_sensorView, TQT_SIGNAL(contextMenu(TDEListView *,
TQListViewItem *, const TQPoint &)), this, TQT_SLOT(menu(KListView *, TQListViewItem *, const TQPoint &)), this, TQT_SLOT(menu(TDEListView *,
TQListViewItem *, const TQPoint &))); TQListViewItem *, const TQPoint &)));
connect( m_sensorView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), connect( m_sensorView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
@ -134,7 +134,7 @@ void SensorsConfig::readConfig()
} }
} }
void SensorsConfig::menu(KListView *, TQListViewItem *, const TQPoint &) void SensorsConfig::menu(TDEListView *, TQListViewItem *, const TQPoint &)
{ {
m_popupMenu = new TQPopupMenu(this); m_popupMenu = new TQPopupMenu(this);

6
ksim/monitors/lm_sensors/sensorsconfig.h
Unescape View File

@ -26,7 +26,7 @@ class TQPushButton;
class TQCheckListItem; class TQCheckListItem;
class TQGridLayout; class TQGridLayout;
class TQLabel; class TQLabel;
class KListView; class TDEListView;
class TQListViewItem; class TQListViewItem;
class TQPopupMenu; class TQPopupMenu;
class KIntSpinBox; class KIntSpinBox;
@ -45,7 +45,7 @@ class SensorsConfig : public KSim::PluginPage
void readConfig(); void readConfig();
private slots: private slots:
void menu(KListView *, TQListViewItem *, const TQPoint &); void menu(TDEListView *, TQListViewItem *, const TQPoint &);
void initSensors(); void initSensors();
void selectAll(); void selectAll();
void unSelectAll(); void unSelectAll();
@ -61,7 +61,7 @@ class SensorsConfig : public KSim::PluginPage
bool m_neverShown; bool m_neverShown;
TQLabel *m_updateLabel; TQLabel *m_updateLabel;
KIntSpinBox *m_sensorSlider; KIntSpinBox *m_sensorSlider;
KListView *m_sensorView; TDEListView *m_sensorView;
TQCheckBox *m_fahrenBox; TQCheckBox *m_fahrenBox;
TQGridLayout *m_layout; TQGridLayout *m_layout;
TQPopupMenu *m_popupMenu; TQPopupMenu *m_popupMenu;

8
ksim/monitors/net/netconfig.cpp
Unescape View File

@ -43,15 +43,15 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name)
TQVBoxLayout *mainLayout = new TQVBoxLayout(this); TQVBoxLayout *mainLayout = new TQVBoxLayout(this);
mainLayout->setSpacing(6); mainLayout->setSpacing(6);
usingBox = new KListView(this); usingBox = new TDEListView(this);
usingBox ->addColumn(i18n("Interface")); usingBox ->addColumn(i18n("Interface"));
usingBox ->addColumn(i18n("Timer")); usingBox ->addColumn(i18n("Timer"));
usingBox ->addColumn(i18n("Commands")); usingBox ->addColumn(i18n("Commands"));
usingBox->setAllColumnsShowFocus(true); usingBox->setAllColumnsShowFocus(true);
connect(usingBox, TQT_SIGNAL(contextMenu(KListView *, connect(usingBox, TQT_SIGNAL(contextMenu(TDEListView *,
TQListViewItem *, const TQPoint &)), TQListViewItem *, const TQPoint &)),
TQT_SLOT(menu(KListView *, TQListViewItem *, const TQPoint &))); TQT_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &)));
connect(usingBox, TQT_SIGNAL(doubleClicked(TQListViewItem *)), connect(usingBox, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
TQT_SLOT(modifyItem(TQListViewItem *))); TQT_SLOT(modifyItem(TQListViewItem *)));
mainLayout->addWidget(usingBox); mainLayout->addWidget(usingBox);
@ -138,7 +138,7 @@ void NetConfig::readConfig()
} }
} }
void NetConfig::menu(KListView *, TQListViewItem *item, const TQPoint &) void NetConfig::menu(TDEListView *, TQListViewItem *item, const TQPoint &)
{ {
aboutMenu = new TQPopupMenu(this); aboutMenu = new TQPopupMenu(this);

6
ksim/monitors/net/netconfig.h
Unescape View File

@ -26,7 +26,7 @@
class NetDialog; class NetDialog;
class TQPopupMenu; class TQPopupMenu;
class TQPushButton; class TQPushButton;
class KListView; class TDEListView;
class TQHBoxLayout; class TQHBoxLayout;
class TQListViewItem; class TQListViewItem;
@ -42,7 +42,7 @@ class NetConfig : public KSim::PluginPage
virtual void readConfig(); virtual void readConfig();
private slots: private slots:
void menu(KListView *, TQListViewItem *, const TQPoint &); void menu(TDEListView *, TQListViewItem *, const TQPoint &);
void modifyItem(TQListViewItem *); void modifyItem(TQListViewItem *);
void removeItem(TQListViewItem *); void removeItem(TQListViewItem *);
void removeCurrent(); void removeCurrent();
@ -58,7 +58,7 @@ class NetConfig : public KSim::PluginPage
TQPushButton *insertButton; TQPushButton *insertButton;
TQPushButton *removeButton; TQPushButton *removeButton;
TQPushButton *modifyButton; TQPushButton *modifyButton;
KListView *usingBox; TDEListView *usingBox;
NetDialog *netDialog; NetDialog *netDialog;
Network::List m_networkList; Network::List m_networkList;
TQString m_yes; TQString m_yes;

2
ksim/monitors/snmp/browsedialogbase.ui
Unescape View File

@ -67,7 +67,7 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget class="KListView" row="1" column="0"> <widget class="TDEListView" row="1" column="0">
<column> <column>
<property name="text"> <property name="text">
<string>Object</string> <string>Object</string>

4
ksim/monitors/snmp/configwidget.ui
Unescape View File

@ -51,7 +51,7 @@
<string>Add...</string> <string>Add...</string>
</property> </property>
</widget> </widget>
<widget class="KListView" row="0" column="0" rowspan="1" colspan="4"> <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="4">
<column> <column>
<property name="text"> <property name="text">
<string>Host</string> <string>Host</string>
@ -163,7 +163,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="KListView" row="0" column="0" rowspan="1" colspan="4"> <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="4">
<column> <column>
<property name="text"> <property name="text">
<string>Name</string> <string>Name</string>

2
ksim/monitors/snmp/proberesultdialogbase.ui
Unescape View File

@ -30,7 +30,7 @@
<string></string> <string></string>
</property> </property>
</widget> </widget>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Object</string> <string>Object</string>

10
ksim/themeprefs.cpp
Unescape View File

@ -43,11 +43,11 @@
#include <common.h> #include <common.h>
#include <themeloader.h> #include <themeloader.h>
class ThemeViewItem : public KListViewItem class ThemeViewItem : public TDEListViewItem
{ {
public: public:
ThemeViewItem(TQListView *parent, const TQString &text, ThemeViewItem(TQListView *parent, const TQString &text,
const KURL &url) : KListViewItem(parent, text) const KURL &url) : TDEListViewItem(parent, text)
{ {
m_url = url; m_url = url;
} }
@ -96,7 +96,7 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
m_authLabel->setText(i18n("None")); m_authLabel->setText(i18n("None"));
m_themeLayout->addMultiCellWidget(m_authLabel, 3, 3, 1, 4); m_themeLayout->addMultiCellWidget(m_authLabel, 3, 3, 1, 4);
m_listView = new KListView(this); m_listView = new TDEListView(this);
m_listView->addColumn(i18n("Theme")); m_listView->addColumn(i18n("Theme"));
m_listView->setFullWidth(true); m_listView->setFullWidth(true);
connect(m_listView, TQT_SIGNAL(currentChanged(TQListViewItem *)), connect(m_listView, TQT_SIGNAL(currentChanged(TQListViewItem *)),
@ -265,8 +265,8 @@ void KSim::ThemePrefs::showFontDialog(int currentItem)
{ {
if (currentItem == 3) { if (currentItem == 3) {
TQFont customFont = m_font; TQFont customFont = m_font;
int result = KFontDialog::getFont(customFont); int result = TDEFontDialog::getFont(customFont);
if (result == KFontDialog::Accepted) if (result == TDEFontDialog::Accepted)
m_font = customFont; m_font = customFont;
} }
} }

4
ksim/themeprefs.h
Unescape View File

@ -26,7 +26,7 @@
class TQListViewItem; class TQListViewItem;
class TQGridLayout; class TQGridLayout;
class TQLabel; class TQLabel;
class KListView; class TDEListView;
class KURLLabel; class KURLLabel;
class KComboBox; class KComboBox;
class KSqueezedTextLabel; class KSqueezedTextLabel;
@ -97,7 +97,7 @@ namespace KSim
void showFontDialog(int); void showFontDialog(int);
private: private:
KListView *m_listView; TDEListView *m_listView;
KURLLabel *m_urlLabel; KURLLabel *m_urlLabel;
KIntSpinBox *m_altTheme; KIntSpinBox *m_altTheme;
KComboBox *m_fontsCombo; KComboBox *m_fontsCombo;

34
superkaramba/src/karamba.cpp
Unescape View File

@ -159,7 +159,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
connect(&taskManager, TQT_SIGNAL(startupRemoved(Startup*)), this, connect(&taskManager, TQT_SIGNAL(startupRemoved(Startup*)), this,
TQT_SLOT(startupRemoved(Startup*)) ); TQT_SLOT(startupRemoved(Startup*)) );
themeConfMenu = new KPopupMenu( this); themeConfMenu = new TDEPopupMenu( this);
themeConfMenu -> setCheckable(true); themeConfMenu -> setCheckable(true);
/* XXX - need to be able to delete all these DesktopChangeSlot objects */ /* XXX - need to be able to delete all these DesktopChangeSlot objects */
@ -167,7 +167,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
int mid; int mid;
toDesktopMenu = new KPopupMenu (this); toDesktopMenu = new TDEPopupMenu (this);
toDesktopMenu -> setCheckable(true); toDesktopMenu -> setCheckable(true);
mid = toDesktopMenu -> insertItem (i18n("&All Desktops"), mid = toDesktopMenu -> insertItem (i18n("&All Desktops"),
dslot = new DesktopChangeSlot(TQT_TQOBJECT(this),0), dslot = new DesktopChangeSlot(TQT_TQOBJECT(this),0),
@ -186,15 +186,15 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
} }
kpop = new KPopupMenu( this ); kpop = new TDEPopupMenu( this );
kpop -> setCheckable(true); kpop -> setCheckable(true);
accColl = new KActionCollection( this ); accColl = new TDEActionCollection( this );
menuAccColl = new KActionCollection( this ); menuAccColl = new TDEActionCollection( this );
kpop->insertItem( SmallIconSet("reload"),i18n("Update"), this, kpop->insertItem( SmallIconSet("reload"),i18n("Update"), this,
TQT_SLOT(updateSensors()), Key_F5 ); TQT_SLOT(updateSensors()), Key_F5 );
toggleLocked = new KToggleAction ( i18n("Toggle &Locked Position"), toggleLocked = new TDEToggleAction ( i18n("Toggle &Locked Position"),
SmallIconSet("locked"), SmallIconSet("locked"),
CTRL+Key_L, TQT_TQOBJECT(this), CTRL+Key_L, TQT_TQOBJECT(this),
TQT_SLOT( slotToggleLocked() ), TQT_SLOT( slotToggleLocked() ),
@ -204,7 +204,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
toggleLocked->plug(kpop); toggleLocked->plug(kpop);
toggleFastTransforms = new KToggleAction(i18n("Use &Fast Image Scaling"), toggleFastTransforms = new TDEToggleAction(i18n("Use &Fast Image Scaling"),
CTRL+Key_F, TQT_TQOBJECT(this), CTRL+Key_F, TQT_TQOBJECT(this),
TQT_SLOT( slotToggleFastTransforms() ), TQT_SLOT( slotToggleFastTransforms() ),
accColl, "Fast transformations"); accColl, "Fast transformations");
@ -1780,7 +1780,7 @@ void karamba::addMenuConfigOption(TQString key, TQString name)
kpop -> setItemEnabled(THEMECONF, true); kpop -> setItemEnabled(THEMECONF, true);
SignalBridge* action = new SignalBridge(TQT_TQOBJECT(this), key, menuAccColl); SignalBridge* action = new SignalBridge(TQT_TQOBJECT(this), key, menuAccColl);
KToggleAction* confItem = new KToggleAction (name, KShortcut::null(), TDEToggleAction* confItem = new TDEToggleAction (name, TDEShortcut::null(),
action, TQT_SLOT(receive()), action, TQT_SLOT(receive()),
menuAccColl, key.ascii()); menuAccColl, key.ascii());
confItem -> setName(key.ascii()); confItem -> setName(key.ascii());
@ -1801,7 +1801,7 @@ void karamba::addMenuConfigOption(TQString key, TQString name)
bool karamba::setMenuConfigOption(TQString key, bool value) bool karamba::setMenuConfigOption(TQString key, bool value)
{ {
//tqDebug("karamba::setMenuConfigOption"); //tqDebug("karamba::setMenuConfigOption");
KToggleAction* menuAction = ((KToggleAction*)menuAccColl -> action(key.ascii())); TDEToggleAction* menuAction = ((TDEToggleAction*)menuAccColl -> action(key.ascii()));
if (menuAction == NULL) if (menuAction == NULL)
{ {
tqWarning("Menu action %s not found.", key.ascii()); tqWarning("Menu action %s not found.", key.ascii());
@ -1817,7 +1817,7 @@ bool karamba::setMenuConfigOption(TQString key, bool value)
bool karamba::readMenuConfigOption(TQString key) bool karamba::readMenuConfigOption(TQString key)
{ {
//tqDebug("karamba::readMenuConfigOption"); //tqDebug("karamba::readMenuConfigOption");
KToggleAction* menuAction = ((KToggleAction*)menuAccColl -> action(key.ascii())); TDEToggleAction* menuAction = ((TDEToggleAction*)menuAccColl -> action(key.ascii()));
if (menuAction == NULL) if (menuAction == NULL)
{ {
tqWarning("Menu action %s not found.", key.ascii()); tqWarning("Menu action %s not found.", key.ascii());
@ -1835,17 +1835,17 @@ void karamba::passMenuItemClicked(int id)
//Everything below is to call the python callback function //Everything below is to call the python callback function
if (pythonIface && pythonIface->isExtensionLoaded()) if (pythonIface && pythonIface->isExtensionLoaded())
{ {
KPopupMenu* menu = 0; TDEPopupMenu* menu = 0;
for(int i = 0; i < (int)menuList->count(); i++) for(int i = 0; i < (int)menuList->count(); i++)
{ {
KPopupMenu* tmp; TDEPopupMenu* tmp;
if(i==0) if(i==0)
{ {
tmp = (KPopupMenu*) menuList->first(); tmp = (TDEPopupMenu*) menuList->first();
} }
else else
{ {
tmp = (KPopupMenu*) menuList->next(); tmp = (TDEPopupMenu*) menuList->next();
} }
if(tmp != 0) if(tmp != 0)
{ {
@ -1992,7 +1992,7 @@ void karamba::toggleWidgetUpdate( bool b)
widgetUpdate = b; widgetUpdate = b;
} }
SignalBridge::SignalBridge(TQObject* parent, TQString name, KActionCollection* ac) SignalBridge::SignalBridge(TQObject* parent, TQString name, TDEActionCollection* ac)
: TQObject(parent, name.ascii()), collection(ac) : TQObject(parent, name.ascii()), collection(ac)
{ {
setName(name.ascii()); setName(name.ascii());
@ -2000,7 +2000,7 @@ SignalBridge::SignalBridge(TQObject* parent, TQString name, KActionCollection* a
void SignalBridge::receive() void SignalBridge::receive()
{ {
emit enabled(name(), ((KToggleAction*)collection -> action(name())) -> emit enabled(name(), ((TDEToggleAction*)collection -> action(name())) ->
isChecked()); isChecked());
} }
@ -2031,7 +2031,7 @@ int DesktopChangeSlot::menuId()
void karamba::showMenuExtension() void karamba::showMenuExtension()
{ {
kglobal = new KPopupMenu(this); kglobal = new TDEPopupMenu(this);
trayMenuToggleId = kglobal->insertItem(SmallIconSet("superkaramba"), trayMenuToggleId = kglobal->insertItem(SmallIconSet("superkaramba"),
i18n("Show System Tray Icon"), this, i18n("Show System Tray Icon"), this,

22
superkaramba/src/karamba.h
Unescape View File

@ -130,8 +130,8 @@ public:
TQString findSensorFromMap(Sensor* sensor); TQString findSensorFromMap(Sensor* sensor);
void deleteMeterFromSensors(Meter* meter); void deleteMeterFromSensors(Meter* meter);
Sensor* findSensorFromList(Meter* meter); Sensor* findSensorFromList(Meter* meter);
KPopupMenu* keditpop; TDEPopupMenu* keditpop;
KPopupMenu *kpop; TDEPopupMenu *kpop;
TQBitmap* widgetMask; TQBitmap* widgetMask;
KarambaRootPixmap *kroot; KarambaRootPixmap *kroot;
TaskManager taskManager; TaskManager taskManager;
@ -225,9 +225,9 @@ private:
// use only the first occurance of KARAMBA in a config file // use only the first occurance of KARAMBA in a config file
bool foundKaramba; bool foundKaramba;
KPopupMenu* themeConfMenu; TDEPopupMenu* themeConfMenu;
KPopupMenu* toDesktopMenu; TDEPopupMenu* toDesktopMenu;
KPopupMenu* kglobal; TDEPopupMenu* kglobal;
DCOPClient *client; DCOPClient *client;
TQCString appId; TQCString appId;
@ -237,11 +237,11 @@ private:
TQPainter p; TQPainter p;
TQPoint clickPos; TQPoint clickPos;
KActionCollection* accColl; TDEActionCollection* accColl;
KActionCollection* menuAccColl; TDEActionCollection* menuAccColl;
KToggleAction *toggleLocked; TDEToggleAction *toggleLocked;
// use highquality scale and rotate algorithms // use highquality scale and rotate algorithms
KToggleAction *toggleFastTransforms; TDEToggleAction *toggleFastTransforms;
// Python module references // Python module references
KarambaPython* pythonIface; KarambaPython* pythonIface;
@ -351,7 +351,7 @@ class SignalBridge : public TQObject
public: public:
SignalBridge(TQObject* parent, TQString, KActionCollection*); SignalBridge(TQObject* parent, TQString, TDEActionCollection*);
signals: signals:
void enabled(TQString, bool); void enabled(TQString, bool);
@ -360,7 +360,7 @@ class SignalBridge : public TQObject
void receive(); void receive();
private: private:
KActionCollection* collection; TDEActionCollection* collection;
}; };
#endif // _KARAMBA_H_ #endif // _KARAMBA_H_

2
superkaramba/src/karamba_python.cpp
Unescape View File

@ -520,7 +520,7 @@ bool KarambaPython::menuOptionChanged(karamba* k, TQString key, bool value)
return callObject("menuOptionChanged", pArgs); return callObject("menuOptionChanged", pArgs);
} }
bool KarambaPython::menuItemClicked(karamba* k, KPopupMenu* menu, long id) bool KarambaPython::menuItemClicked(karamba* k, TDEPopupMenu* menu, long id)
{ {
PyObject* pArgs = Py_BuildValue((char*)"(lll)", k, menu, id); PyObject* pArgs = Py_BuildValue((char*)"(lll)", k, menu, id);
return callObject("menuItemClicked", pArgs); return callObject("menuItemClicked", pArgs);

4
superkaramba/src/karamba_python.h
Unescape View File

@ -26,7 +26,7 @@
#define KARAMBA_PYTHON_H #define KARAMBA_PYTHON_H
class TQString; class TQString;
class KPopupMenu; class TDEPopupMenu;
class Task; class Task;
class Startup; class Startup;
class karamba; class karamba;
@ -67,7 +67,7 @@ public:
bool widgetClicked(karamba* k, int x, int y, int button); bool widgetClicked(karamba* k, int x, int y, int button);
bool keyPressed(karamba* k, const Meter* meter, const TQString& text); bool keyPressed(karamba* k, const Meter* meter, const TQString& text);
bool widgetMouseMoved(karamba* k, int x, int y, int button); bool widgetMouseMoved(karamba* k, int x, int y, int button);
bool menuItemClicked(karamba* k, KPopupMenu* menu, long id); bool menuItemClicked(karamba* k, TDEPopupMenu* menu, long id);
bool activeTaskChanged(karamba* k, Task* t); bool activeTaskChanged(karamba* k, Task* t);
bool taskAdded(karamba* k, Task* t); bool taskAdded(karamba* k, Task* t);
bool taskRemoved(karamba* k, Task* t); bool taskRemoved(karamba* k, Task* t);

4
superkaramba/src/karambaapp.cpp
Unescape View File

@ -129,7 +129,7 @@ void KarambaApplication::checkSuperKarambaDir()
void KarambaApplication::setUpSysTray(TDEAboutData* about) void KarambaApplication::setUpSysTray(TDEAboutData* about)
{ {
//kdDebug() << k_funcinfo << endl; //kdDebug() << k_funcinfo << endl;
KAction* action; TDEAction* action;
//Create theme list window. //Create theme list window.
//This will function as the main window for the tray icon //This will function as the main window for the tray icon
@ -138,7 +138,7 @@ void KarambaApplication::setUpSysTray(TDEAboutData* about)
//Set up systray icon //Set up systray icon
sysTrayIcon = new KSystemTray(themeListWindow); sysTrayIcon = new KSystemTray(themeListWindow);
KPopupMenu *menu = sysTrayIcon->contextMenu(); TDEPopupMenu *menu = sysTrayIcon->contextMenu();
menu->insertItem(SmallIconSet("superkaramba"), menu->insertItem(SmallIconSet("superkaramba"),
i18n("Hide System Tray Icon"), this, i18n("Hide System Tray Icon"), this,
TQT_SLOT(globalHideSysTray())); TQT_SLOT(globalHideSysTray()));

20
superkaramba/src/menu_python.cpp
Unescape View File

@ -37,7 +37,7 @@ long createMenu(long widget)
{ {
karamba* currTheme = (karamba*)widget; karamba* currTheme = (karamba*)widget;
KPopupMenu* tmp = new KPopupMenu(currTheme); TDEPopupMenu* tmp = new TDEPopupMenu(currTheme);
currTheme->menuList->append( TQT_TQOBJECT(tmp) ); currTheme->menuList->append( TQT_TQOBJECT(tmp) );
currTheme->connect(tmp, TQT_SIGNAL(activated(int)), currTheme, currTheme->connect(tmp, TQT_SIGNAL(activated(int)), currTheme,
@ -54,20 +54,20 @@ PyObject* py_create_menu(PyObject *, PyObject *args)
return Py_BuildValue((char*)"l", createMenu(widget)); return Py_BuildValue((char*)"l", createMenu(widget));
} }
bool menuExists(karamba* currTheme, KPopupMenu* menu) bool menuExists(karamba* currTheme, TDEPopupMenu* menu)
{ {
bool foundMenu = false; bool foundMenu = false;
KPopupMenu* tmp; TDEPopupMenu* tmp;
for(int i = 0; i < (int)currTheme->menuList->count(); i++) for(int i = 0; i < (int)currTheme->menuList->count(); i++)
{ {
if(i==0) if(i==0)
{ {
tmp = (KPopupMenu*) currTheme->menuList->first(); tmp = (TDEPopupMenu*) currTheme->menuList->first();
} }
else else
{ {
tmp = (KPopupMenu*) currTheme->menuList->next(); tmp = (TDEPopupMenu*) currTheme->menuList->next();
} }
if(tmp != 0) if(tmp != 0)
{ {
@ -84,7 +84,7 @@ bool menuExists(karamba* currTheme, KPopupMenu* menu)
long deleteMenu(long widget, long menu) long deleteMenu(long widget, long menu)
{ {
karamba* currTheme = (karamba*)widget; karamba* currTheme = (karamba*)widget;
KPopupMenu* tmp = (KPopupMenu*)menu; TDEPopupMenu* tmp = (TDEPopupMenu*)menu;
currTheme->menuList->removeRef(TQT_TQOBJECT(tmp)); currTheme->menuList->removeRef(TQT_TQOBJECT(tmp));
@ -102,7 +102,7 @@ PyObject* py_delete_menu(PyObject *, PyObject *args)
long addMenuItem(long widget, long menu, TQString text, TQString icon) long addMenuItem(long widget, long menu, TQString text, TQString icon)
{ {
karamba* currTheme = (karamba*)widget; karamba* currTheme = (karamba*)widget;
KPopupMenu* tmp = (KPopupMenu*)menu; TDEPopupMenu* tmp = (TDEPopupMenu*)menu;
long id = 0; long id = 0;
if(menuExists(currTheme, tmp)) if(menuExists(currTheme, tmp))
@ -129,7 +129,7 @@ PyObject* py_add_menu_item(PyObject *, PyObject *args)
long addMenuSeparator(long widget, long menu) long addMenuSeparator(long widget, long menu)
{ {
karamba* currTheme = (karamba*)widget; karamba* currTheme = (karamba*)widget;
KPopupMenu* tmp = (KPopupMenu*)menu; TDEPopupMenu* tmp = (TDEPopupMenu*)menu;
long id = 0; long id = 0;
if(menuExists(currTheme, tmp)) if(menuExists(currTheme, tmp))
@ -153,7 +153,7 @@ PyObject* py_add_menu_separator(PyObject *, PyObject *args)
long removeMenuItem(long widget, long menu, long id) long removeMenuItem(long widget, long menu, long id)
{ {
karamba* currTheme = (karamba*)widget; karamba* currTheme = (karamba*)widget;
KPopupMenu* tmp = (KPopupMenu*)menu; TDEPopupMenu* tmp = (TDEPopupMenu*)menu;
if(menuExists(currTheme,tmp)) if(menuExists(currTheme,tmp))
{ {
@ -177,7 +177,7 @@ PyObject* py_remove_menu_item(PyObject *, PyObject *args)
long popupMenu(long widget, long menu, long x, long y) long popupMenu(long widget, long menu, long x, long y)
{ {
karamba* currTheme = (karamba*)widget; karamba* currTheme = (karamba*)widget;
KPopupMenu* tmp = (KPopupMenu*)menu; TDEPopupMenu* tmp = (TDEPopupMenu*)menu;
if(menuExists(currTheme,tmp)) if(menuExists(currTheme,tmp))
{ {

8
tdewallet/allyourbase.cpp
Unescape View File

@ -39,7 +39,7 @@
* KWalletFolderItem - ListView items to represent tdewallet folders * KWalletFolderItem - ListView items to represent tdewallet folders
*/ */
KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, const TQString &name, int entries) KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, const TQString &name, int entries)
: KListViewItem(parent),_wallet(w),_name(name),_entries(entries) { : TDEListViewItem(parent),_wallet(w),_name(name),_entries(entries) {
setText(0, TQString("%1 (%2)").arg(_name).arg(_entries)); setText(0, TQString("%1 (%2)").arg(_name).arg(_entries));
setRenameEnabled(0, false); setRenameEnabled(0, false);
setDragEnabled(true); setDragEnabled(true);
@ -122,7 +122,7 @@ KWalletFolderItem::~KWalletFolderItem() {
* passwords, maps, ... * passwords, maps, ...
*/ */
KWalletContainerItem::KWalletContainerItem(TQListViewItem* parent, const TQString &name, KWallet::Wallet::EntryType type) KWalletContainerItem::KWalletContainerItem(TQListViewItem* parent, const TQString &name, KWallet::Wallet::EntryType type)
: KListViewItem(parent, name), _type(type) { : TDEListViewItem(parent, name), _type(type) {
setRenameEnabled(0, false); setRenameEnabled(0, false);
setDragEnabled(true); setDragEnabled(true);
} }
@ -155,7 +155,7 @@ TQListViewItem *KWalletContainerItem::getItem(const TQString& key) {
* KWalletEntryItem - ListView items to represent tdewallet entries * KWalletEntryItem - ListView items to represent tdewallet entries
*/ */
KWalletEntryItem::KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* parent, const TQString& ename) KWalletEntryItem::KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* parent, const TQString& ename)
: KListViewItem(parent, ename), _wallet(w), _oldName(ename) { : TDEListViewItem(parent, ename), _wallet(w), _oldName(ename) {
setRenameEnabled(0, true); setRenameEnabled(0, true);
setDragEnabled(true); setDragEnabled(true);
} }
@ -349,7 +349,7 @@ class KWalletFolderDrag : public TQStoredDrag {
* KWalletEntryList - A listview to store wallet entries * KWalletEntryList - A listview to store wallet entries
*/ */
KWalletEntryList::KWalletEntryList(TQWidget *parent, const char *name) KWalletEntryList::KWalletEntryList(TQWidget *parent, const char *name)
: KListView(parent, name) { : TDEListView(parent, name) {
addColumn(i18n("Folders")); addColumn(i18n("Folders"));
setRootIsDecorated(true); setRootIsDecorated(true);
setDefaultRenameAction(Reject); setDefaultRenameAction(Reject);

8
tdewallet/allyourbase.h
Unescape View File

@ -37,7 +37,7 @@ enum KWalletListItemClasses {
KWalletUnknownClass = 2000 KWalletUnknownClass = 2000
}; };
class KWalletEntryItem : public KListViewItem { class KWalletEntryItem : public TDEListViewItem {
public: public:
KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* parent, const TQString& ename); KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* parent, const TQString& ename);
virtual ~KWalletEntryItem(); virtual ~KWalletEntryItem();
@ -55,7 +55,7 @@ class KWalletEntryItem : public KListViewItem {
TQString _oldName; TQString _oldName;
}; };
class KWalletContainerItem : public KListViewItem { class KWalletContainerItem : public TDEListViewItem {
public: public:
KWalletContainerItem(TQListViewItem* parent, const TQString& name, KWalletContainerItem(TQListViewItem* parent, const TQString& name,
KWallet::Wallet::EntryType type); KWallet::Wallet::EntryType type);
@ -71,7 +71,7 @@ class KWalletContainerItem : public KListViewItem {
KWallet::Wallet::EntryType _type; KWallet::Wallet::EntryType _type;
}; };
class KWalletFolderItem : public KListViewItem { class KWalletFolderItem : public TDEListViewItem {
public: public:
KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, KWalletFolderItem(KWallet::Wallet *w, TQListView* parent,
const TQString& name, int entries); const TQString& name, int entries);
@ -95,7 +95,7 @@ class KWalletFolderItem : public KListViewItem {
int _entries; int _entries;
}; };
class KWalletEntryList : public KListView { class KWalletEntryList : public TDEListView {
Q_OBJECT Q_OBJECT
public: public:

2
tdewallet/konfigurator/konfigurator.cpp
Unescape View File

@ -303,7 +303,7 @@ TQString KWalletConfig::quickHelp() const {
void KWalletConfig::contextMenuRequested(TQListViewItem *item, const TQPoint& pos, int col) { void KWalletConfig::contextMenuRequested(TQListViewItem *item, const TQPoint& pos, int col) {
Q_UNUSED(col) Q_UNUSED(col)
if (item && item->parent()) { if (item && item->parent()) {
KPopupMenu *m = new KPopupMenu(this); TDEPopupMenu *m = new TDEPopupMenu(this);
m->insertTitle(item->parent()->text(0)); m->insertTitle(item->parent()->text(0));
m->insertItem(i18n("&Delete"), this, TQT_SLOT(deleteEntry()), Key_Delete); m->insertItem(i18n("&Delete"), this, TQT_SLOT(deleteEntry()), Key_Delete);
m->popup(pos); m->popup(pos);

4
tdewallet/kwmapeditor.cpp
Unescape View File

@ -33,7 +33,7 @@
KWMapEditor::KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *parent, const char *name) KWMapEditor::KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *parent, const char *name)
: TQTable(0, 3, parent, name), _map(map) { : TQTable(0, 3, parent, name), _map(map) {
_ac = new KActionCollection(this); _ac = new TDEActionCollection(this);
_copyAct = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), _ac); _copyAct = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), _ac);
connect(this, TQT_SIGNAL(valueChanged(int,int)), this, TQT_SIGNAL(dirty())); connect(this, TQT_SIGNAL(valueChanged(int,int)), this, TQT_SIGNAL(dirty()));
connect(this, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), connect(this, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)),
@ -117,7 +117,7 @@ void KWMapEditor::emitDirty() {
void KWMapEditor::contextMenu(int row, int col, const TQPoint& pos) { void KWMapEditor::contextMenu(int row, int col, const TQPoint& pos) {
_contextRow = row; _contextRow = row;
_contextCol = col; _contextCol = col;
KPopupMenu *m = new KPopupMenu(this); TDEPopupMenu *m = new TDEPopupMenu(this);
m->insertItem(i18n("&New Entry"), this, TQT_SLOT(addEntry())); m->insertItem(i18n("&New Entry"), this, TQT_SLOT(addEntry()));
_copyAct->plug(m); _copyAct->plug(m);
m->popup(pos); m->popup(pos);

8
tdewallet/kwmapeditor.h
Unescape View File

@ -24,8 +24,8 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqtable.h> #include <tqtable.h>
class KAction; class TDEAction;
class KActionCollection; class TDEActionCollection;
class KWMapEditor : public TQTable { class KWMapEditor : public TQTable {
Q_OBJECT Q_OBJECT
@ -55,8 +55,8 @@ class KWMapEditor : public TQTable {
private: private:
TQMap<TQString,TQString>& _map; TQMap<TQString,TQString>& _map;
int _contextRow, _contextCol; int _contextRow, _contextCol;
KActionCollection *_ac; TDEActionCollection *_ac;
KAction *_copyAct; TDEAction *_copyAct;
}; };
#endif #endif

18
tdewallet/tdewalleteditor.cpp
Unescape View File

@ -63,7 +63,7 @@
#include <stdlib.h> #include <stdlib.h>
KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *parent, const char *name) KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *parent, const char *name)
: KMainWindow(parent, name), _walletName(wallet), _nonLocal(isPath) { : TDEMainWindow(parent, name), _walletName(wallet), _nonLocal(isPath) {
_newWallet = false; _newWallet = false;
_ww = new WalletWidget(this, "Wallet Widget"); _ww = new WalletWidget(this, "Wallet Widget");
_copyPassAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copyPassword()), actionCollection()); _copyPassAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copyPassword()), actionCollection());
@ -72,7 +72,7 @@ KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *pare
box->setSpacing( KDialog::spacingHint() ); box->setSpacing( KDialog::spacingHint() );
box->setMargin( KDialog::marginHint() ); box->setMargin( KDialog::marginHint() );
_entryList = new KWalletEntryList(_ww->_entryListFrame, "Wallet Entry List"); _entryList = new KWalletEntryList(_ww->_entryListFrame, "Wallet Entry List");
box->addWidget(new KListViewSearchLineWidget(_entryList, _ww->_entryListFrame)); box->addWidget(new TDEListViewSearchLineWidget(_entryList, _ww->_entryListFrame));
box->addWidget(_entryList); box->addWidget(_entryList);
_ww->_entryStack->setEnabled(true); _ww->_entryStack->setEnabled(true);
@ -158,13 +158,13 @@ void KWalletEditor::layout() {
} }
void KWalletEditor::createActions() { void KWalletEditor::createActions() {
_newFolderAction = new KAction(i18n("&New Folder..."), "folder_new", _newFolderAction = new TDEAction(i18n("&New Folder..."), "folder_new",
0, TQT_TQOBJECT(this), TQT_SLOT(createFolder()), actionCollection(), 0, TQT_TQOBJECT(this), TQT_SLOT(createFolder()), actionCollection(),
"create_folder"); "create_folder");
connect(this, TQT_SIGNAL(enableFolderActions(bool)), connect(this, TQT_SIGNAL(enableFolderActions(bool)),
_newFolderAction, TQT_SLOT(setEnabled(bool))); _newFolderAction, TQT_SLOT(setEnabled(bool)));
_deleteFolderAction = new KAction(i18n("&Delete Folder"), 0, 0, _deleteFolderAction = new TDEAction(i18n("&Delete Folder"), 0, 0,
TQT_TQOBJECT(this), TQT_SLOT(deleteFolder()), actionCollection(), TQT_TQOBJECT(this), TQT_SLOT(deleteFolder()), actionCollection(),
"delete_folder"); "delete_folder");
connect(this, TQT_SIGNAL(enableContextFolderActions(bool)), connect(this, TQT_SIGNAL(enableContextFolderActions(bool)),
@ -172,25 +172,25 @@ void KWalletEditor::createActions() {
connect(this, TQT_SIGNAL(enableFolderActions(bool)), connect(this, TQT_SIGNAL(enableFolderActions(bool)),
_deleteFolderAction, TQT_SLOT(setEnabled(bool))); _deleteFolderAction, TQT_SLOT(setEnabled(bool)));
_passwordAction = new KAction(i18n("Change &Password..."), 0, 0, TQT_TQOBJECT(this), _passwordAction = new TDEAction(i18n("Change &Password..."), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(changePassword()), actionCollection(), TQT_SLOT(changePassword()), actionCollection(),
"change_password"); "change_password");
connect(this, TQT_SIGNAL(enableWalletActions(bool)), connect(this, TQT_SIGNAL(enableWalletActions(bool)),
_passwordAction, TQT_SLOT(setEnabled(bool))); _passwordAction, TQT_SLOT(setEnabled(bool)));
_mergeAction = new KAction(i18n("&Merge Wallet..."), 0, 0, TQT_TQOBJECT(this), _mergeAction = new TDEAction(i18n("&Merge Wallet..."), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(importWallet()), actionCollection(), TQT_SLOT(importWallet()), actionCollection(),
"merge"); "merge");
connect(this, TQT_SIGNAL(enableWalletActions(bool)), connect(this, TQT_SIGNAL(enableWalletActions(bool)),
_mergeAction, TQT_SLOT(setEnabled(bool))); _mergeAction, TQT_SLOT(setEnabled(bool)));
_importAction = new KAction(i18n("&Import XML..."), 0, 0, TQT_TQOBJECT(this), _importAction = new TDEAction(i18n("&Import XML..."), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(importXML()), actionCollection(), TQT_SLOT(importXML()), actionCollection(),
"import"); "import");
connect(this, TQT_SIGNAL(enableWalletActions(bool)), connect(this, TQT_SIGNAL(enableWalletActions(bool)),
_importAction, TQT_SLOT(setEnabled(bool))); _importAction, TQT_SLOT(setEnabled(bool)));
_exportAction = new KAction(i18n("&Export..."), 0, 0, TQT_TQOBJECT(this), _exportAction = new TDEAction(i18n("&Export..."), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(exportXML()), actionCollection(), TQT_SLOT(exportXML()), actionCollection(),
"export"); "export");
connect(this, TQT_SIGNAL(enableWalletActions(bool)), connect(this, TQT_SIGNAL(enableWalletActions(bool)),
@ -577,7 +577,7 @@ void KWalletEditor::listContextMenuRequested(TQListViewItem *item, const TQPoint
menuClass = static_cast<KWalletListItemClasses>(item->rtti()); menuClass = static_cast<KWalletListItemClasses>(item->rtti());
} }
KPopupMenu *m = new KPopupMenu(this); TDEPopupMenu *m = new TDEPopupMenu(this);
if (item) { if (item) {
TQString title = item->text(0); TQString title = item->text(0);
// I think 200 pixels is wide enough for a title // I think 200 pixels is wide enough for a title

12
tdewallet/tdewalleteditor.h
Unescape View File

@ -26,7 +26,7 @@
#include <kmainwindow.h> #include <kmainwindow.h>
#include <tqstringlist.h> #include <tqstringlist.h>
class KAction; class TDEAction;
class TQIconViewItem; class TQIconViewItem;
class TQListViewItem; class TQListViewItem;
class TQCheckBox; class TQCheckBox;
@ -34,7 +34,7 @@ class KWalletFolderIconView;
class KWalletEntryList; class KWalletEntryList;
class KWMapEditor; class KWMapEditor;
class KWalletEditor : public KMainWindow { class KWalletEditor : public TDEMainWindow {
Q_OBJECT Q_OBJECT
@ -84,7 +84,7 @@ class KWalletEditor : public KMainWindow {
void enableWalletActions(bool enable); void enableWalletActions(bool enable);
void enableFolderActions(bool enable); void enableFolderActions(bool enable);
void enableContextFolderActions(bool enable); void enableContextFolderActions(bool enable);
void editorClosed(KMainWindow*); void editorClosed(TDEMainWindow*);
public: public:
TQString _walletName; TQString _walletName;
@ -96,9 +96,9 @@ class KWalletEditor : public KMainWindow {
WalletWidget *_ww; WalletWidget *_ww;
KWalletEntryList *_entryList; KWalletEntryList *_entryList;
bool _walletIsOpen; bool _walletIsOpen;
KAction *_newFolderAction, *_deleteFolderAction; TDEAction *_newFolderAction, *_deleteFolderAction;
KAction *_passwordAction, *_exportAction, *_saveAsAction, *_mergeAction, *_importAction; TDEAction *_passwordAction, *_exportAction, *_saveAsAction, *_mergeAction, *_importAction;
KAction *_copyPassAction; TDEAction *_copyPassAction;
TQLabel*_details; TQLabel*_details;
TQString _currentFolder; TQString _currentFolder;
TQMap<TQString,TQString> _currentMap; // save memory by storing TQMap<TQString,TQString> _currentMap; // save memory by storing

20
tdewallet/tdewalletmanager.cpp
Unescape View File

@ -47,7 +47,7 @@
#include <tqtooltip.h> #include <tqtooltip.h>
KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f) KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
: KMainWindow(parent, name, f), DCOPObject("KWalletManager") { : TDEMainWindow(parent, name, f), DCOPObject("KWalletManager") {
TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet"); TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
_tdewalletdLaunch = false; _tdewalletdLaunch = false;
TQAccel *accel = new TQAccel(this, "tdewalletmanager"); TQAccel *accel = new TQAccel(this, "tdewalletmanager");
@ -112,16 +112,16 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
// wallet closes before we are done opening. We will then stay // wallet closes before we are done opening. We will then stay
// open. Must check that a wallet is still open here. // open. Must check that a wallet is still open here.
new KAction(i18n("&New Wallet..."), "tdewalletmanager", 0, TQT_TQOBJECT(this), new TDEAction(i18n("&New Wallet..."), "tdewalletmanager", 0, TQT_TQOBJECT(this),
TQT_SLOT(createWallet()), actionCollection(), TQT_SLOT(createWallet()), actionCollection(),
"wallet_create"); "wallet_create");
KAction *act = new KAction(i18n("Configure &Wallet..."), "configure", TDEAction *act = new TDEAction(i18n("Configure &Wallet..."), "configure",
0, TQT_TQOBJECT(this), TQT_SLOT(setupWallet()), actionCollection(), 0, TQT_TQOBJECT(this), TQT_SLOT(setupWallet()), actionCollection(),
"wallet_settings"); "wallet_settings");
if (_tray) { if (_tray) {
act->plug(_tray->contextMenu()); act->plug(_tray->contextMenu());
} }
act = new KAction(i18n("Close &All Wallets"), 0, 0, TQT_TQOBJECT(this), act = new TDEAction(i18n("Close &All Wallets"), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(closeAllWallets()), actionCollection(), TQT_SLOT(closeAllWallets()), actionCollection(),
"close_all_wallets"); "close_all_wallets");
if (_tray) { if (_tray) {
@ -256,8 +256,8 @@ void KWalletManager::changeWalletPassword(const TQString& walletName) {
void KWalletManager::openWalletFile(const TQString& path) { void KWalletManager::openWalletFile(const TQString& path) {
KWalletEditor *we = new KWalletEditor(path, true, this, "Wallet Editor"); KWalletEditor *we = new KWalletEditor(path, true, this, "Wallet Editor");
if (we->isOpen()) { if (we->isOpen()) {
connect(we, TQT_SIGNAL(editorClosed(KMainWindow*)), connect(we, TQT_SIGNAL(editorClosed(TDEMainWindow*)),
this, TQT_SLOT(editorClosed(KMainWindow*))); this, TQT_SLOT(editorClosed(TDEMainWindow*)));
we->show(); we->show();
} else { } else {
KMessageBox::sorry(this, i18n("Error opening wallet %1.").arg(path)); KMessageBox::sorry(this, i18n("Error opening wallet %1.").arg(path));
@ -286,7 +286,7 @@ void KWalletManager::openWallet(const TQString& walletName) {
void KWalletManager::openWallet(const TQString& walletName, bool newWallet) { void KWalletManager::openWallet(const TQString& walletName, bool newWallet) {
// Don't allow a wallet to open in two windows // Don't allow a wallet to open in two windows
for (KMainWindow *w = _windows.first(); w; w = _windows.next()) { for (TDEMainWindow *w = _windows.first(); w; w = _windows.next()) {
KWalletEditor *e = static_cast<KWalletEditor*>(w); KWalletEditor *e = static_cast<KWalletEditor*>(w);
if (e->isOpen() && e->_walletName == walletName) { if (e->isOpen() && e->_walletName == walletName) {
w->raise(); w->raise();
@ -297,8 +297,8 @@ void KWalletManager::openWallet(const TQString& walletName, bool newWallet) {
KWalletEditor *we = new KWalletEditor(walletName, false, this, "Wallet Editor"); KWalletEditor *we = new KWalletEditor(walletName, false, this, "Wallet Editor");
we->setNewWallet(newWallet); we->setNewWallet(newWallet);
if (we->isOpen()) { if (we->isOpen()) {
connect(we, TQT_SIGNAL(editorClosed(KMainWindow*)), connect(we, TQT_SIGNAL(editorClosed(TDEMainWindow*)),
this, TQT_SLOT(editorClosed(KMainWindow*))); this, TQT_SLOT(editorClosed(TDEMainWindow*)));
we->show(); we->show();
_windows.append(we); _windows.append(we);
} else if (!newWallet) { } else if (!newWallet) {
@ -337,7 +337,7 @@ void KWalletManager::possiblyQuit() {
} }
void KWalletManager::editorClosed(KMainWindow* e) { void KWalletManager::editorClosed(TDEMainWindow* e) {
_windows.remove(e); _windows.remove(e);
} }

6
tdewallet/tdewalletmanager.h
Unescape View File

@ -30,7 +30,7 @@ class TQIconViewItem;
class DCOPRef; class DCOPRef;
class KWalletManager : public KMainWindow, public DCOPObject { class KWalletManager : public TDEMainWindow, public DCOPObject {
Q_OBJECT Q_OBJECT
// //
K_DCOP K_DCOP
@ -66,7 +66,7 @@ class KWalletManager : public KMainWindow, public DCOPObject {
private slots: private slots:
void shuttingDown(); void shuttingDown();
void possiblyQuit(); void possiblyQuit();
void editorClosed(KMainWindow* e); void editorClosed(TDEMainWindow* e);
void possiblyRescan(const TQCString& app); void possiblyRescan(const TQCString& app);
void setupWallet(); void setupWallet();
void openWallet(); void openWallet();
@ -78,7 +78,7 @@ class KWalletManager : public KMainWindow, public DCOPObject {
bool _shuttingDown; bool _shuttingDown;
KWalletIconView *_iconView; KWalletIconView *_iconView;
DCOPRef *_dcopRef; DCOPRef *_dcopRef;
TQPtrList<KMainWindow> _windows; TQPtrList<TDEMainWindow> _windows;
bool _tdewalletdLaunch; bool _tdewalletdLaunch;
}; };

16
tdewallet/tdewalletpopup.cpp
Unescape View File

@ -29,26 +29,26 @@
#include <kstdguiitem.h> #include <kstdguiitem.h>
KWalletPopup::KWalletPopup(const TQString& wallet, TQWidget *parent, const char *name) KWalletPopup::KWalletPopup(const TQString& wallet, TQWidget *parent, const char *name)
: KPopupMenu(parent, name), _walletName(wallet) { : TDEPopupMenu(parent, name), _walletName(wallet) {
insertTitle(wallet); insertTitle(wallet);
KActionCollection *ac = new KActionCollection(this, "tdewallet context actions"); TDEActionCollection *ac = new TDEActionCollection(this, "tdewallet context actions");
KAction *act; TDEAction *act;
act = new KAction(i18n("&New Wallet..."), 0, 0, TQT_TQOBJECT(this), act = new TDEAction(i18n("&New Wallet..."), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(createWallet()), ac, "wallet_create"); TQT_SLOT(createWallet()), ac, "wallet_create");
act->plug(this); act->plug(this);
act = new KAction(i18n("&Open..."), 0, Key_Return, TQT_TQOBJECT(this), act = new TDEAction(i18n("&Open..."), 0, Key_Return, TQT_TQOBJECT(this),
TQT_SLOT(openWallet()), ac, "wallet_open"); TQT_SLOT(openWallet()), ac, "wallet_open");
act->plug(this); act->plug(this);
act = new KAction(i18n("Change &Password..."), 0, 0, TQT_TQOBJECT(this), act = new TDEAction(i18n("Change &Password..."), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(changeWalletPassword()), ac, "wallet_password"); TQT_SLOT(changeWalletPassword()), ac, "wallet_password");
act->plug(this); act->plug(this);
TQStringList ul = KWallet::Wallet::users(wallet); TQStringList ul = KWallet::Wallet::users(wallet);
if (!ul.isEmpty()) { if (!ul.isEmpty()) {
KPopupMenu *pm = new KPopupMenu(this, "Disconnect Apps"); TDEPopupMenu *pm = new TDEPopupMenu(this, "Disconnect Apps");
int id = 7000; int id = 7000;
for (TQStringList::Iterator it = ul.begin(); it != ul.end(); ++it) { for (TQStringList::Iterator it = ul.begin(); it != ul.end(); ++it) {
_appMap[id] = *it; _appMap[id] = *it;
@ -67,7 +67,7 @@ KWalletPopup::KWalletPopup(const TQString& wallet, TQWidget *parent, const char
act->setEnabled(KWallet::Wallet::isOpen(wallet)); act->setEnabled(KWallet::Wallet::isOpen(wallet));
act->plug(this); act->plug(this);
act = new KAction(i18n("&Delete"), 0, Key_Delete, TQT_TQOBJECT(this), act = new TDEAction(i18n("&Delete"), 0, Key_Delete, TQT_TQOBJECT(this),
TQT_SLOT(deleteWallet()), ac, "wallet_delete"); TQT_SLOT(deleteWallet()), ac, "wallet_delete");
act->plug(this); act->plug(this);
} }

2
tdewallet/tdewalletpopup.h
Unescape View File

@ -24,7 +24,7 @@
#include <tqmap.h> #include <tqmap.h>
#include <tqstring.h> #include <tqstring.h>
class KWalletPopup : public KPopupMenu { class KWalletPopup : public TDEPopupMenu {
Q_OBJECT Q_OBJECT

Write Preview
Loading…
Cancel
Save