Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 1ec2b02ce0
commit b87cd1a44c

@ -903,7 +903,7 @@ void BatchWizard::loadData( const TQString & data )
} }
// new config entry!!! // new config entry!!!
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
config->setGroup("FileFormat"); config->setGroup("FileFormat");
int pos[3] = { config->readNumEntry("Data0", 0 ), int pos[3] = { config->readNumEntry("Data0", 0 ),
config->readNumEntry("Data1", 1 ), config->readNumEntry("Data1", 1 ),

@ -174,7 +174,7 @@ void ConfigDialog::setupTab3()
TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
grid->addItem( spacer, 5, 0 ); grid->addItem( spacer, 5, 0 );
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
config->setGroup("FileFormat"); config->setGroup("FileFormat");
combo1->setCurrentItem( config->readNumEntry("Data0", 0 ) ); combo1->setCurrentItem( config->readNumEntry("Data0", 0 ) );
combo2->setCurrentItem( config->readNumEntry("Data1", 1 ) ); combo2->setCurrentItem( config->readNumEntry("Data1", 1 ) );
@ -301,7 +301,7 @@ void ConfigDialog::setupTab5()
void ConfigDialog::accept() void ConfigDialog::accept()
{ {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
config->setGroup("FileFormat"); config->setGroup("FileFormat");
config->writeEntry("Data0", combo1->currentItem() ); config->writeEntry("Data0", combo1->currentItem() );
config->writeEntry("Data1", combo2->currentItem() ); config->writeEntry("Data1", combo2->currentItem() );

@ -298,7 +298,7 @@ bool Definition::openFile()
TQString f = locateLocal( "data", "kbarcode/labeldefinitions.sql" ); TQString f = locateLocal( "data", "kbarcode/labeldefinitions.sql" );
if( !TQFile::exists( f ) ) { if( !TQFile::exists( f ) ) {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
config->setGroup( "Definitions" ); config->setGroup( "Definitions" );
// copy file to new location // copy file to new location
@ -552,7 +552,7 @@ bool Definition::showFileError()
TQString f = KFileDialog::getOpenFileName( TQString(), TQString(), 0 ); TQString f = KFileDialog::getOpenFileName( TQString(), TQString(), 0 );
if( !f.isEmpty() && TQFile::exists( f ) ) { if( !f.isEmpty() && TQFile::exists( f ) ) {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
config->setGroup( "Definitions" ); config->setGroup( "Definitions" );
config->writeEntry( "defpath", f ); config->writeEntry( "defpath", f );
config->sync(); config->sync();

@ -126,7 +126,7 @@ void DSMainWindow::setupActions()
void DSMainWindow::loadConfig() void DSMainWindow::loadConfig()
{ {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
config->setGroup("Wizard"); config->setGroup("Wizard");
first = config->readBoolEntry("firststart2", true ); first = config->readBoolEntry("firststart2", true );
@ -145,7 +145,7 @@ void DSMainWindow::loadConfig()
void DSMainWindow::saveConfig() void DSMainWindow::saveConfig()
{ {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
config->setGroup("Wizard"); config->setGroup("Wizard");
config->writeEntry("firststart2", false ); config->writeEntry("firststart2", false );

@ -56,7 +56,7 @@ KBarcodeSettings::~KBarcodeSettings()
void KBarcodeSettings::saveConfig() void KBarcodeSettings::saveConfig()
{ {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
config->setGroup("LabelEditor"); config->setGroup("LabelEditor");
config->writeEntry("grid", gridsize ); config->writeEntry("grid", gridsize );
@ -67,7 +67,7 @@ void KBarcodeSettings::saveConfig()
void KBarcodeSettings::loadConfig() void KBarcodeSettings::loadConfig()
{ {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
TQColor tmpc( TQt::lightGray ); TQColor tmpc( TQt::lightGray );
config->setGroup("LabelEditor"); config->setGroup("LabelEditor");

@ -181,7 +181,7 @@ LabelEditor::~LabelEditor()
void LabelEditor::loadConfig() void LabelEditor::loadConfig()
{ {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
recentAct->loadEntries( config, "RecentFiles" ); recentAct->loadEntries( config, "RecentFiles" );
gridAct->setChecked( config->readBoolEntry("gridenabled", false ) ); gridAct->setChecked( config->readBoolEntry("gridenabled", false ) );
@ -190,7 +190,7 @@ void LabelEditor::loadConfig()
void LabelEditor::saveConfig() void LabelEditor::saveConfig()
{ {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
recentAct->saveEntries( config, "RecentFiles" ); recentAct->saveEntries( config, "RecentFiles" );
@ -204,7 +204,7 @@ void LabelEditor::saveConfig()
void LabelEditor::createCommandHistory() void LabelEditor::createCommandHistory()
{ {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
if( undoAct && redoAct ) if( undoAct && redoAct )
{ {

@ -139,7 +139,7 @@ PreviewDialog::PreviewDialog( TQIODevice* device, Definition* d, TQString filena
connect( customerName, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( customerNameChanged(int) ) ); connect( customerName, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( customerNameChanged(int) ) );
connect( customerId, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( customerIdChanged(int) ) ); connect( customerId, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( customerIdChanged(int) ) );
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
config->setGroup( "PreviewDialog" ); config->setGroup( "PreviewDialog" );
resize( config->readNumEntry( "width", width() ), config->readNumEntry( "height", height() ) ); resize( config->readNumEntry( "width", width() ), config->readNumEntry( "height", height() ) );
@ -149,7 +149,7 @@ PreviewDialog::PreviewDialog( TQIODevice* device, Definition* d, TQString filena
PreviewDialog::~PreviewDialog() PreviewDialog::~PreviewDialog()
{ {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
config->setGroup( "PreviewDialog" ); config->setGroup( "PreviewDialog" );
config->writeEntry( "width", width() ); config->writeEntry( "width", width() );
config->writeEntry( "height", height() ); config->writeEntry( "height", height() );

@ -93,7 +93,7 @@ PrinterSettings* PrinterSettings::getInstance()
void PrinterSettings::loadConfig() void PrinterSettings::loadConfig()
{ {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
config->setGroup("Printer"); config->setGroup("Printer");
lpdata->articleEvent1 = (enum linebreak)config->readNumEntry("articleEvent1", NO_BREAK ); lpdata->articleEvent1 = (enum linebreak)config->readNumEntry("articleEvent1", NO_BREAK );
@ -128,7 +128,7 @@ void PrinterSettings::loadConfig()
void PrinterSettings::saveConfig() void PrinterSettings::saveConfig()
{ {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
config->setGroup("Printer"); config->setGroup("Printer");
config->writeEntry("articleEvent1", lpdata->articleEvent1 ); config->writeEntry("articleEvent1", lpdata->articleEvent1 );

@ -283,7 +283,7 @@ void SqlTables::importLabelDef()
TQString f = locateLocal( "data", "kbarcode/labeldefinitions.sql" ); TQString f = locateLocal( "data", "kbarcode/labeldefinitions.sql" );
if( !TQFile::exists( f ) ) { if( !TQFile::exists( f ) ) {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
config->setGroup( "Definitions" ); config->setGroup( "Definitions" );
f = config->readEntry( "defpath", locate( "data", "kbarcode/labeldefinitions.sql" ) ); f = config->readEntry( "defpath", locate( "data", "kbarcode/labeldefinitions.sql" ) );
} }
@ -342,7 +342,7 @@ void SqlTables::exec( TQSqlQuery* query, const TQString & text )
void SqlTables::loadConfig() void SqlTables::loadConfig()
{ {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
config->setGroup("SQL"); config->setGroup("SQL");
sqldata.username = config->readEntry("username", "root"); sqldata.username = config->readEntry("username", "root");
@ -355,7 +355,7 @@ void SqlTables::loadConfig()
void SqlTables::saveConfig() void SqlTables::saveConfig()
{ {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
config->setGroup("SQL"); config->setGroup("SQL");
config->writeEntry("username", sqldata.username ); config->writeEntry("username", sqldata.username );

Loading…
Cancel
Save